Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-13 23:58:32 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-13 23:58:32 +0400
commit496b7da7a0cb85dd87fd4360691cc2d7cb50f484 (patch)
tree99eb5d5145ab6aa3bb915444b268e84bb463eadb /features
parent1587caa3e4d5b87e322612195a3db38212489c83 (diff)
Fix spinach tests
Diffstat (limited to 'features')
-rw-r--r--features/steps/admin/admin_teams.rb6
-rw-r--r--features/steps/project/project_team_management.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/features/steps/admin/admin_teams.rb b/features/steps/admin/admin_teams.rb
index 6423f3dfd9b..65c7e485f48 100644
--- a/features/steps/admin/admin_teams.rb
+++ b/features/steps/admin/admin_teams.rb
@@ -46,13 +46,13 @@ class AdminTeams < Spinach::FeatureSteps
Then 'I should see only me in members table' do
members_list = find("#members_list .member")
members_list.should have_content(current_user.name)
- members_list.should have_content(current_user.email)
+ members_list.should have_content(current_user.username)
end
When 'I select user "John" from user list as "Developer"' do
@user ||= User.find_by_name("John")
within "#team_members" do
- select "#{@user.name} (#{@user.email})", from: "user_ids"
+ select "#{@user.name} (#{@user.username})", from: "user_ids"
select "Developer", from: "default_project_access"
end
end
@@ -129,7 +129,7 @@ class AdminTeams < Spinach::FeatureSteps
When 'I select user "Jimm" ub team members list as "Master"' do
user = User.find_by_name("Jimm")
within "#team_members" do
- select "#{user.name} (#{user.email})", from: "user_ids"
+ select "#{user.name} (#{user.username})", from: "user_ids"
select "Developer", from: "default_project_access"
end
end
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb
index fb7666bc994..49e9a93fb43 100644
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
@@ -21,7 +21,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
And 'I select "Mike" as "Reporter"' do
user = User.find_by_name("Mike")
within "#new_team_member" do
- select user.name, :from => "user_ids"
+ select "#{user.name} (#{user.username})", :from => "user_ids"
select "Reporter", :from => "project_access"
end
click_button "Add users"