Commit 999f1848 authored by Phil Hughes's avatar Phil Hughes

Tests update

parent 931d09f4
.panel.panel-default .panel.panel-default.project-members-groups
.panel-heading .panel-heading
Groups with access to Groups with access to
%strong #{@project.name} %strong #{@project.name}
......
= form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project) do |f| = form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project), html: { class: 'users-project-form' } do |f|
.row .row
.col-md-4.col-lg-6 .col-md-4.col-lg-6
= users_select_tag(:user_ids, multiple: true, class: "input-full", scope: :all, email_user: true) = users_select_tag(:user_ids, multiple: true, class: "input-full", scope: :all, email_user: true)
......
...@@ -79,3 +79,5 @@ ...@@ -79,3 +79,5 @@
%span.visible-xs-block %span.visible-xs-block
Delete Delete
= icon('trash', class: 'hidden-xs') = icon('trash', class: 'hidden-xs')
- else
%span.member-access-text= member.human_access
...@@ -70,7 +70,7 @@ class Spinach::Features::AdminProjects < Spinach::FeatureSteps ...@@ -70,7 +70,7 @@ class Spinach::Features::AdminProjects < Spinach::FeatureSteps
select "Developer", from: "access_level" select "Developer", from: "access_level"
end end
click_button "Add users to project" click_button "Add to project"
end end
step 'I should see current user as "Developer"' do step 'I should see current user as "Developer"' do
......
class Spinach::Features::GroupMembers < Spinach::FeatureSteps class Spinach::Features::GroupMembers < Spinach::FeatureSteps
include WaitForAjax
include SharedAuthentication include SharedAuthentication
include SharedPaths include SharedPaths
include SharedGroup include SharedGroup
...@@ -116,9 +117,8 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps ...@@ -116,9 +117,8 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
member = mary_jane_member member = mary_jane_member
page.within "#group_member_#{member.id}" do page.within "#group_member_#{member.id}" do
click_button 'Edit'
select 'Developer', from: "member_access_level_#{member.id}" select 'Developer', from: "member_access_level_#{member.id}"
click_on 'Save' wait_for_ajax
end end
end end
......
...@@ -22,7 +22,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps ...@@ -22,7 +22,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
select2(user.id, from: "#user_ids", multiple: true) select2(user.id, from: "#user_ids", multiple: true)
select "Reporter", from: "access_level" select "Reporter", from: "access_level"
end end
click_button "Add users to project" click_button "Add to project"
end end
step 'I should see "Mike" in team list as "Reporter"' do step 'I should see "Mike" in team list as "Reporter"' do
...@@ -36,10 +36,10 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps ...@@ -36,10 +36,10 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
step 'I select "sjobs@apple.com" as "Reporter"' do step 'I select "sjobs@apple.com" as "Reporter"' do
page.within ".users-project-form" do page.within ".users-project-form" do
select2("sjobs@apple.com", from: "#user_ids", multiple: true) find('#user_ids', visible: false).set('sjobs@apple.com')
select "Reporter", from: "access_level" select "Reporter", from: "access_level"
end end
click_button "Add users to project" click_button "Add to project"
end end
step 'I should see "sjobs@apple.com" in team list as invited "Reporter"' do step 'I should see "sjobs@apple.com" in team list as invited "Reporter"' do
...@@ -65,9 +65,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps ...@@ -65,9 +65,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
user = User.find_by(name: 'Dmitriy') user = User.find_by(name: 'Dmitriy')
project_member = project.project_members.find_by(user_id: user.id) project_member = project.project_members.find_by(user_id: user.id)
page.within "#project_member_#{project_member.id}" do page.within "#project_member_#{project_member.id}" do
click_button 'Edit'
select "Reporter", from: "member_access_level_#{project_member.id}" select "Reporter", from: "member_access_level_#{project_member.id}"
click_button "Save"
end end
end end
...@@ -144,8 +142,9 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps ...@@ -144,8 +142,9 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
end end
step 'I should see "Opensource" group user listing' do step 'I should see "Opensource" group user listing' do
expect(page).to have_content("Shared with OpenSource group, members with Master role (2)") page.within '.project-members-groups' do
expect(page).to have_content(@os_user1.name) expect(page).to have_content('OpenSource')
expect(page).to have_content(@os_user2.name) expect(find('select').value).to eq('40')
end
end end
end end
...@@ -41,7 +41,7 @@ feature 'Groups > Members > Owner manages access requests', feature: true do ...@@ -41,7 +41,7 @@ feature 'Groups > Members > Owner manages access requests', feature: true do
def expect_visible_access_request(group, user) def expect_visible_access_request(group, user)
expect(group.requesters.exists?(user_id: user)).to be_truthy expect(group.requesters.exists?(user_id: user)).to be_truthy
expect(page).to have_content "#{group.name} access requests 1" expect(page).to have_content "Users requesting access to #{group.name} 1"
expect(page).to have_content user.name expect(page).to have_content user.name
end end
end end
...@@ -41,7 +41,7 @@ feature 'Projects > Members > Master manages access requests', feature: true do ...@@ -41,7 +41,7 @@ feature 'Projects > Members > Master manages access requests', feature: true do
def expect_visible_access_request(project, user) def expect_visible_access_request(project, user)
expect(project.requesters.exists?(user_id: user)).to be_truthy expect(project.requesters.exists?(user_id: user)).to be_truthy
expect(page).to have_content "#{project.name} access requests 1" expect(page).to have_content "Users requesting access to #{project.name} 1"
expect(page).to have_content user.name expect(page).to have_content user.name
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment