Skip to content

Commit

Permalink
Change of language around selecting team leader.
Browse files Browse the repository at this point in the history
  • Loading branch information
lukesands-co committed Feb 16, 2016
1 parent 6664be4 commit abd3477
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
6 changes: 2 additions & 4 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ en:
memberships:
leader:
mine: |
Tick this box if you lead the <span id="team-led">team above</span>.
(More than one person can be selected as team leader.)
Tick this box if you are the leader of the <span id="team-led">team above</span>.
other: |
This person leads the <span id="team-led">team above</span>.
(More than one person can be selected as team leader.)
This person is the leader of the <span id="team-led">team above</span>.
subscribed:
mine: |
Tick this box if you want to be alerted by email whenever anyone
Expand Down
2 changes: 1 addition & 1 deletion spec/features/login_page_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
login_page.request_button.click

expect(token_created_page).to be_displayed
expect(token_created_page.info).to have_text('When it arrives, click on the link (which is active for 3 hours). This will log you in to People Finder and enable you to make any changes.')
expect(token_created_page.info).to have_text('We’re just emailing you a link to access People Finder. This can take up to 5 minutes. When it arrives, click on the link (which is active for 4 hours).')
end
end
end
14 changes: 7 additions & 7 deletions spec/features/person_membership_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
fill_in 'Main email', with: person_attributes[:email]
fill_in 'Job title', with: 'Head Honcho'

expect(page).to have_selector('#team-led', text: 'Ministry of Justice team')
expect(page).to have_selector('.hint', text: 'This person leads the Ministry of Justice team. (More than one person can be selected as team leader.)')
expect(page).to have_selector('#team-led', text: 'Cabinet Office team')
expect(page).to have_selector('.hint', text: 'This person is the leader of the Cabinet Office team.')

select_in_team_select 'Digital Justice'

expect(page).to have_selector('#team-led', text: 'Digital Justice [MOJ] team')
expect(page).to have_selector('.hint', text: 'This person leads the Digital Justice [MOJ] team. (More than one person can be selected as team leader.)')
expect(page).to have_selector('#team-led', text: 'Digital Justice [CO] team')
expect(page).to have_selector('.hint', text: 'This person is the leader of the Digital Justice [CO] team.')
check 'leader'
click_button 'Save', match: :first

Expand All @@ -34,7 +34,7 @@
expect(membership).to be_subscribed

visit group_path(group)
expect(page).to have_selector('.group-leader h4', text: 'Taylor')
expect(page).to have_selector('.group-leader h4', text: 'Oliver')
expect(page).to have_selector('.group-leader .leader-role', text: 'Head Honcho')
end

Expand All @@ -43,7 +43,7 @@

javascript_log_in
visit edit_person_path(person)
expect(page).to have_selector('#team-led', text: 'Digital Justice [MOJ] team')
expect(page).to have_selector('#team-led', text: 'Digital Justice [CO] team')

fill_in 'Job title', with: 'Head Honcho'
click_button 'Save', match: :first
Expand Down Expand Up @@ -140,7 +140,7 @@
end

def create_person_in_digital_justice
department = create(:department, name: 'Ministry of Justice')
department = create(:department, name: 'Cabinet Office')
group = create(:group, name: 'Digital Justice', parent: department)
person = create(:person)
person.memberships.create(group: group)
Expand Down
2 changes: 1 addition & 1 deletion spec/features/suggestion_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
end

scenario 'Ask an admin to remove the profile', user: :regular do
check 'remove the profile as the person has left #{brand}'
check 'remove the profile as the person has left the Cabinet Office'
fill_in 'Person left info', with: 'They have left to become a goatherd'
click_button 'Submit'

Expand Down

0 comments on commit abd3477

Please sign in to comment.