fix test

Author: Kimberley Cook

app/views/invitations/show.html.haml

@@ -15,7 +15,7 @@
       - if @invitation.for_student?
         - if [email protected]
           - if @member.already_attending(@event)
-            %p You have already RSVP'd to this event as a coach! Please cancel through the email confirmation you received if you wish to sign up as a student instead.
+            %p You have already RSVP'd to this event as a coach! Please cancel through the email confirmation you received if you wish to join us as a student instead.
           - else
             - if @event.event_student_spaces?
               - if @event.tito_url.present?

config/locales/en.yml

@@ -333,11 +333,11 @@ en:
     community_partner_title: Community partners
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student*"
+    sign_up_as_student: "Join us as a student*"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"

config/locales/en_AU.yml

@@ -221,9 +221,9 @@ en-AU:
   members:
     sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"

config/locales/en_GB.yml

@@ -219,11 +219,11 @@ en-GB:
   sponsors:
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"

config/locales/en_US.yml

@@ -217,11 +217,11 @@ en-US:
   sponsors:
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"

config/locales/fi.yml

@@ -52,12 +52,12 @@ fi:
     participate:
       students_title: "Students"
       students_explanation_p1: "Our students come from a variety of backgrounds. Some want to become full-time developers, whereas some would like to learn the basics of coding in a supportive environment."
-      students_explanation_p2: "Sign up to join our vibrant community and attend our workshops."
-      students_button: "Sign up as a student"
+      students_explanation_p2: "Join our vibrant community and attend our workshops."
+      students_button: "Join us as a student"
       coaches_title: "Coaches"
       coaches_explanation_p1: "We encourage new students to work on our HTML/CSS, JavaScript, Ruby, Python or Git <a href='http://tutorials.codebar.io'>tutorials</a>. We also help them understand programming concepts."
       coaches_explanation_p2: "Therefore we are always on the lookout for more developers to join our community and help coach at our workshops."
-      coaches_button: "Sign up as a coach"
+      coaches_button: "Join us as a coach"
       workshop_title: "Workshops"
       workshop_explanation_p1: "We are hosted by some amazing companies who support our cause. Our normal format is 30 minutes of socialising with food and drink, followed by a lightning talk then coding."
       workshop_explanation_p2: Help our expansion and enable us to provide help and support to our chapters by hosting and sponsoring our workshops.
@@ -219,11 +219,11 @@ fi:
   sponsors:
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"

config/locales/no.yml

@@ -219,11 +219,11 @@
   sponsors:
     sponsoring: "Sponsoring"
   members:
-    sign_up: "Sign up"
+    sign_up: "Join our community"
     sign_in_with_github: "Sign in with GitHub"
-    sign_up_as_student: "Sign up as a student"
+    sign_up_as_student: "Join us as a student"
     sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
-    sign_up_as_coach: "Sign up as a coach"
+    sign_up_as_coach: "Join us as a coach"
     code_of_conduct: "code of conduct"
     new:
       intro: "We offer a welcoming, inclusive and learning-friendly environment, and have a zero tolerance policy towards any form of harassment or inappropriate behavior. Before you sign up, read our"

spec/features/accepting_terms_and_conditions_spec.rb

@@ -8,8 +8,8 @@
 
     scenario 'they can''t proceed unless they accept the ToCs' do
       visit root_path
-      click_on 'Sign up as a student'
-      click_on 'Sign up as a student'
+      click_on 'Join us as a student'
+      click_on 'Join us as a student'
 
       expect(page).to have_current_path(terms_and_conditions_path)
 
@@ -20,8 +20,8 @@
 
     scenario 'they can read the Code of Conduct before accepting the ToCs', js: true do
       visit root_path
-      click_on 'Sign up as a student'
-      click_on 'Sign up as a student'
+      click_on 'Join us as a student'
+      click_on 'Join us as a student'
 
       expect(page).to have_current_path(terms_and_conditions_path)
 
@@ -35,8 +35,8 @@
 
     scenario 'they can fill in their details after they accept the ToCs' do
       visit root_path
-      click_on 'Sign up as a student'
-      click_on 'Sign up as a student'
+      click_on 'Join us as a student'
+      click_on 'Join us as a student'
 
       expect(page).to have_current_path(terms_and_conditions_path)
 

spec/features/member_joining_spec.rb

@@ -7,8 +7,8 @@
 
   scenario 'A visitor can access signups through the landing page' do
     visit root_path
-    click_on 'Sign up as a student'
-    click_on 'Sign up as a student'
+    click_on 'Join us as a student'
+    click_on 'Join us as a student'
 
     accept_toc
 
@@ -33,7 +33,7 @@
 
   scenario 'A new member details are successfully captured' do
     visit new_member_path
-    click_on 'Sign up as a coach'
+    click_on 'Join us as a coach'
 
     accept_toc
 

spec/features/subscribing_to_newsletter_spec.rb

@@ -20,7 +20,7 @@
       expect(mailing_list).to receive(:subscribe).with('[email protected]', 'Jane', 'Doe')
 
       visit new_member_path
-      click_on 'Sign up as a coach'
+      click_on 'Join us as a coach'
 
       accept_toc
 
@@ -39,7 +39,7 @@
       expect(mailing_list).to receive(:unsubscribe).with('[email protected]')
 
       visit new_member_path
-      click_on 'Sign up as a coach'
+      click_on 'Join us as a coach'
 
       accept_toc