From c5143ddb0e100e4622ffabf92408678257b4cdcf Mon Sep 17 00:00:00 2001 From: Godwin Date: Thu, 15 Jun 2017 16:49:55 -0700 Subject: [PATCH] Fixed broken tests and disabled ajax on registration for i18n capturing --- app/helpers/registration_helper.rb | 2 +- features/registration.feature | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/registration_helper.rb b/app/helpers/registration_helper.rb index 8728010..0a71205 100644 --- a/app/helpers/registration_helper.rb +++ b/app/helpers/registration_helper.rb @@ -133,7 +133,7 @@ module RegistrationHelper content_tag(:div, actions.html_safe, class: :buttons).html_safe end - form_tag(register_path(conference.slug), class: @no_ajax ? nil : 'js-xhr') do + form_tag(register_path(conference.slug), class: (LinguaFranca.recording? || @no_ajax ? nil : 'js-xhr')) do content.html_safe + (hidden_field_tag :step, step).html_safe + actions.html_safe diff --git a/features/registration.feature b/features/registration.feature index c9274e2..2cf7a57 100644 --- a/features/registration.feature +++ b/features/registration.feature @@ -40,7 +40,7 @@ Feature: Registration Then I should see 'Which languages do you speak?' When I click the 'Next' button - Then I should see 'Are you representing a bicycle collective?' + Then I should see 'Do you participate in a community bicycle project?' When I click the 'Yes' button Then I should see 'In which city or town is your organization based?' @@ -162,7 +162,7 @@ Feature: Registration Then I should see 'Which languages do you speak?' When I click the 'Next' button - Then I should see 'Are you representing a bicycle collective?' + Then I should see 'Do you participate in a community bicycle project?' When I click the 'Yes' button Then I should see 'In which city or town is your organization based?' @@ -172,7 +172,7 @@ Feature: Registration Then I should see 'Did you mean Moncton, New Brunswick, Canada?' When I click the 'Yes' button - Then I should see 'What is the name or your organization?' + Then I should see 'What is the name of your organization?' When I fill in the name with 'Coopérative La Bikery Cooperative' And click the 'Next' button @@ -243,7 +243,7 @@ Feature: Registration Then I should see 'Which languages do you speak?' When I click the 'Next' button - Then I should see 'Are you representing a bicycle collective?' + Then I should see 'Do you participate in a community bicycle project?' When I click the 'No' button Then I should see 'In which city or town are you based?' @@ -309,7 +309,7 @@ Feature: Registration Then I should see 'Which languages do you speak?' When I click the 'Next' button - Then I should see 'Are you representing a bicycle collective?' + Then I should see 'Do you participate in a community bicycle project?' When I click the 'No' button Then I should see 'In which city or town are you based?' @@ -420,7 +420,7 @@ Feature: Registration Then I should see 'Select at least one language' When I click the 'Next' button - Then I should see 'Are you representing a bicycle collective?' + Then I should see 'Do you participate in a community bicycle project?' When I click the 'Yes' button Then I should see 'In which city or town is your organization based?' @@ -438,7 +438,7 @@ Feature: Registration Then I should see 'Which organization are you a member of?' When I click the 'None of the above' button - Then I should see 'What is the name or your organization?' + Then I should see 'What is the name of your organization?' When I click the 'Next' button Then I should see 'Enter the name of your organization' @@ -571,7 +571,7 @@ Scenario: Housing providers can enter incorrect data and fix it Then I should see 'Which languages do you speak?' When I click the 'Next' button - Then I should see 'Are you representing a bicycle collective?' + Then I should see 'Do you participate in a community bicycle project?' When I click the 'No' button Then I should see 'In which city or town are you based?'