From d62775a785e60129fe7efdf738c4ddd3418c5877 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 7 Oct 2015 18:05:59 +1100
Subject: [PATCH] update specs and fix labels yes and no

---
 .../javascripts/templates/registration/about.html.haml       | 4 ++--
 config/locales/en.yml                                        | 5 +----
 spec/features/consumer/registration_spec.rb                  | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/templates/registration/about.html.haml b/app/assets/javascripts/templates/registration/about.html.haml
index 4742d5deb1..230154af78 100644
--- a/app/assets/javascripts/templates/registration/about.html.haml
+++ b/app/assets/javascripts/templates/registration/about.html.haml
@@ -45,9 +45,9 @@
             .field
               %label{ for: 'enterprise_charges_sales_tax' }= t(:charges_sales_tax)
               %input{ id: 'enterprise_charges_sales_tax_true', type: 'radio', name: 'charges_sales_tax', value: 'true', required: true, ng: { model: 'enterprise.charges_sales_tax' } }
-              %label{ for: 'enterprise_charges_sales_tax_true' } {{t('yes')}}
+              %label{ for: 'enterprise_charges_sales_tax_true' } {{t('say_yes')}}
               %input{ id: 'enterprise_charges_sales_tax_false', type: 'radio', name: 'charges_sales_tax', value: 'false', required: true, ng: { model: 'enterprise.charges_sales_tax' } }
-              %label{ for: 'enterprise_charges_sales_tax_false' } {{t('no')}}
+              %label{ for: 'enterprise_charges_sales_tax_false' } {{t('say_no')}}
               %span.error.small-12.columns{ ng: { show: "about.charges_sales_tax.$error.required && submitted" } }
                 {{t('enterprise_tax_required')}}
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 377451cba9..80ed0c01a0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -547,8 +547,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   enterprise_abn_placeholder: "eg. 99 123 456 789"
   enterprise_acn: "ACN"
   enterprise_acn_placeholder: "eg. 123 456 789"
-  yes: "Yes"
-  no: "No"
   enterprise_tax_required: "You need to make a selection."
   enterprise_final_step: "Final step!"
   enterprise_social_text: "How can people find %{enterprise} online?"
@@ -583,7 +581,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   registration_finished_activate_instruction_html: "We've sent a confirmation email to <strong>%{email}</strong> if it hasn't been activated before.<br/>
 Please follow the instructions there to make your enterprise visible on the Open Food Network."
   registration_finished_action: "Open Food Network home"
-  registration_type_headline: "Last step to add %{enterprise}"
+  registration_type_headline: "Last step to add %{enterprise}!"
   registration_type_question: "Are you a producer?"
   registration_type_producer: "Yes, I'm a producer"
   registration_type_no_producer: "No, I'm not a producer"
@@ -614,7 +612,6 @@ Please follow the instructions there to make your enterprise visible on the Open
   registration_detail_state_error: "State required"
   registration_detail_country: "Country:"
   registration_detail_country_error: "Please select a country"
-  registration_detail_: ""
   fees: "Fees"
   item_cost: "Item cost"
   bulk: "Bulk"
diff --git a/spec/features/consumer/registration_spec.rb b/spec/features/consumer/registration_spec.rb
index 5084f4c05b..d36cd48f7d 100644
--- a/spec/features/consumer/registration_spec.rb
+++ b/spec/features/consumer/registration_spec.rb
@@ -102,7 +102,7 @@ feature "Registration", js: true do
     # Link appears to be unresponsive for a while, so keep clicking it until it works
     using_wait_time 0.5 do
       10.times do
-        click_link "Login"
+        find("a", text: "Login").click()
         break if page.has_selector? "dd.active", text: "Login"
       end
     end