diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-04-23 18:53:07 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-23 18:59:57 -0400 |
commit | 9b330859bff436de55fa9a36f95c923e0e4b0f94 (patch) | |
tree | a4562049b7f984c36ef38f3c574b8608348fdbcd /features | |
parent | 3ae31c228283d9cb59f54f81f37f01efb1ee263e (diff) | |
download | gitlab-ce-9b330859bff436de55fa9a36f95c923e0e4b0f94.tar.gz |
Change "Sam" to "Dmitriy" in feature stepsrs-sam-to-dmitriy
"Sam" was too short and generic and caused invalid test failures due to
finding other people with names like "Sammie" or "Samuel" unexpectedly.
Diffstat (limited to 'features')
-rw-r--r-- | features/project/team_management.feature | 16 | ||||
-rw-r--r-- | features/steps/project/team_management.rb | 32 |
2 files changed, 24 insertions, 24 deletions
diff --git a/features/project/team_management.feature b/features/project/team_management.feature index 6cda225ea7b..09a7df59df6 100644 --- a/features/project/team_management.feature +++ b/features/project/team_management.feature @@ -3,13 +3,13 @@ Feature: Project Team Management Given I sign in as a user And I own project "Shop" And gitlab user "Mike" - And gitlab user "Sam" - And "Sam" is "Shop" developer + And gitlab user "Dmitriy" + And "Dmitriy" is "Shop" developer And I visit project "Shop" team page Scenario: See all team members Then I should be able to see myself in team - And I should see "Sam" in team list + And I should see "Dmitriy" in team list @javascript Scenario: Add user to project @@ -25,14 +25,14 @@ Feature: Project Team Management @javascript Scenario: Update user access - Given I should see "Sam" in team list as "Developer" - And I change "Sam" role to "Reporter" - And I should see "Sam" in team list as "Reporter" + Given I should see "Dmitriy" in team list as "Developer" + And I change "Dmitriy" role to "Reporter" + And I should see "Dmitriy" in team list as "Reporter" Scenario: Cancel team member - Given I click cancel link for "Sam" + Given I click cancel link for "Dmitriy" Then I visit project "Shop" team page - And I should not see "Sam" in team list + And I should not see "Dmitriy" in team list Scenario: Import team from another project Given I own project "Website" diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb index e95621071c4..09e5af3ef48 100644 --- a/features/steps/project/team_management.rb +++ b/features/steps/project/team_management.rb @@ -9,8 +9,8 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps page.should have_content(@user.username) end - step 'I should see "Sam" in team list' do - user = User.find_by(name: "Sam") + step 'I should see "Dmitriy" in team list' do + user = User.find_by(name: "Dmitriy") page.should have_content(user.name) page.should have_content(user.username) end @@ -51,15 +51,15 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps end end - step 'I should see "Sam" in team list as "Developer"' do + step 'I should see "Dmitriy" in team list as "Developer"' do within ".access-developer" do - page.should have_content('Sam') + page.should have_content('Dmitriy') end end - step 'I change "Sam" role to "Reporter"' do + step 'I change "Dmitriy" role to "Reporter"' do project = Project.find_by(name: "Shop") - user = User.find_by(name: 'Sam') + user = User.find_by(name: 'Dmitriy') project_member = project.project_members.find_by(user_id: user.id) within "#project_member_#{project_member.id}" do click_button "Edit access level" @@ -68,9 +68,9 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps end end - step 'I should see "Sam" in team list as "Reporter"' do + step 'I should see "Dmitriy" in team list as "Reporter"' do within ".access-reporter" do - page.should have_content('Sam') + page.should have_content('Dmitriy') end end @@ -78,8 +78,8 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps click_link "Remove from team" end - step 'I should not see "Sam" in team list' do - user = User.find_by(name: "Sam") + step 'I should not see "Dmitriy" in team list' do + user = User.find_by(name: "Dmitriy") page.should_not have_content(user.name) page.should_not have_content(user.username) end @@ -88,12 +88,12 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps create(:user, name: "Mike") end - step 'gitlab user "Sam"' do - create(:user, name: "Sam") + step 'gitlab user "Dmitriy"' do + create(:user, name: "Dmitriy") end - step '"Sam" is "Shop" developer' do - user = User.find_by(name: "Sam") + step '"Dmitriy" is "Shop" developer' do + user = User.find_by(name: "Dmitriy") project = Project.find_by(name: "Shop") project.team << [user, :developer] end @@ -119,9 +119,9 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps click_button 'Import' end - step 'I click cancel link for "Sam"' do + step 'I click cancel link for "Dmitriy"' do project = Project.find_by(name: "Shop") - user = User.find_by(name: 'Sam') + user = User.find_by(name: 'Dmitriy') project_member = project.project_members.find_by(user_id: user.id) within "#project_member_#{project_member.id}" do click_link('Remove user from team') |