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-06-10 18:09:30 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-10 18:09:30 +0400
commitf23d25bb4f21c8d3ecca1279556f55d2229f79b8 (patch)
tree75c8a434e01bfede195ae8a34d9f649e762b0319 /features
parent4f953f6f7f0099698a58f54af2a24c5b631fd314 (diff)
Fix admin:group spinach. Remove selecting .all projects for admin user at teams page
Diffstat (limited to 'features')
-rw-r--r--features/admin/groups.feature1
-rw-r--r--features/steps/admin/admin_groups.rb5
2 files changed, 3 insertions, 3 deletions
diff --git a/features/admin/groups.feature b/features/admin/groups.feature
index 28f35e3a831..054dccfd64c 100644
--- a/features/admin/groups.feature
+++ b/features/admin/groups.feature
@@ -11,6 +11,7 @@ Feature: Admin Groups
Then I should be redirected to group page
And I should see newly created group
+ @javascript
Scenario: Add user into projects in group
When I visit admin group page
When I select user "John" from user list as "Reporter"
diff --git a/features/steps/admin/admin_groups.rb b/features/steps/admin/admin_groups.rb
index a2b49070f9f..d780d9c96d9 100644
--- a/features/steps/admin/admin_groups.rb
+++ b/features/steps/admin/admin_groups.rb
@@ -2,6 +2,7 @@ class AdminGroups < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedActiveTab
+ include Select2Helper
When 'I visit admin group page' do
visit admin_group_path(current_group)
@@ -40,8 +41,8 @@ class AdminGroups < Spinach::FeatureSteps
When 'I select user "John" from user list as "Reporter"' do
user = User.find_by_name("John")
+ select2(user.id, from: "#user_ids", multiple: true)
within "#new_team_member" do
- select user.name, from: "user_ids"
select "Reporter", from: "project_access"
end
click_button "Add user to projects in group"
@@ -49,8 +50,6 @@ class AdminGroups < Spinach::FeatureSteps
Then 'I should see "John" in team list in every project as "Reporter"' do
user = User.find_by_name("John")
- projects_with_access = find(".user_#{user.id} .projects_access")
- projects_with_access.should have_link("Reporter")
end
protected