summaryrefslogtreecommitdiff
path: root/features/steps/admin
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-21 12:27:52 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-21 12:27:52 +0200
commit37187336b1ae92751d98f33d1f378aac069ecdaa (patch)
tree9c29ec0e5a8619556c77dcfad8f1553e88bf3380 /features/steps/admin
parent28da2a8bdc8fd5cbb05a32933c0ab1c56202481f (diff)
downloadgitlab-ce-37187336b1ae92751d98f33d1f378aac069ecdaa.tar.gz
Team features are green now
Diffstat (limited to 'features/steps/admin')
-rw-r--r--features/steps/admin/admin_teams.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/features/steps/admin/admin_teams.rb b/features/steps/admin/admin_teams.rb
index 5c66b24bccf..637fc4e58f3 100644
--- a/features/steps/admin/admin_teams.rb
+++ b/features/steps/admin/admin_teams.rb
@@ -9,7 +9,7 @@ class AdminTeams < Spinach::FeatureSteps
end
And 'Create gitlab user "John"' do
- @user = create(:user, :name => "John")
+ @user = create(:user, name: "John")
end
And 'I click new team link' do
@@ -50,8 +50,8 @@ class AdminTeams < Spinach::FeatureSteps
When 'I select user "John" from user list as "Developer"' do
@user ||= User.find_by_name("John")
within "#team_members" do
- select @user.name, :from => "user_ids"
- select "Developer", :from => "default_project_access"
+ select "#{@user.name} (#{@user.email})", from: "user_ids"
+ select "Developer", from: "default_project_access"
end
end
@@ -89,8 +89,8 @@ class AdminTeams < Spinach::FeatureSteps
When 'I select project "Shop" with max access "Reporter"' do
@project ||= Project.find_by_name("Shop")
within "#assign_projects" do
- select @project.name, :from => "project_ids"
- select "Reporter", :from => "greatest_project_access"
+ select @project.name, from: "project_ids"
+ select "Reporter", from: "greatest_project_access"
end
end
@@ -127,8 +127,8 @@ 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, :from => "user_ids"
- select "Developer", :from => "default_project_access"
+ select "#{user.name} (#{user.email})", from: "user_ids"
+ select "Developer", from: "default_project_access"
end
end