Fix and remove duplicate specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
bf05ca88ee
commit
909a0ff3ac
|
@ -5,53 +5,9 @@ Feature: Dashboard Group
|
|||
And "John Doe" is owner of group "Owned"
|
||||
And "John Doe" is guest of group "Guest"
|
||||
|
||||
# Leave groups
|
||||
|
||||
@javascript
|
||||
Scenario: Owner should be able to leave from group if he is not the last owner
|
||||
Given "Mary Jane" is owner of group "Owned"
|
||||
When I visit dashboard groups page
|
||||
Then I should see group "Owned" in group list
|
||||
Then I should see group "Guest" in group list
|
||||
When I click on the "Leave" button for group "Owned"
|
||||
And I visit dashboard groups page
|
||||
Then I should not see group "Owned" in group list
|
||||
Then I should see group "Guest" in group list
|
||||
|
||||
@javascript
|
||||
Scenario: Owner should not be able to leave from group if he is the last owner
|
||||
Given "Mary Jane" is guest of group "Owned"
|
||||
When I visit dashboard groups page
|
||||
Then I should see group "Owned" in group list
|
||||
Then I should see group "Guest" in group list
|
||||
When I click on the "Leave" button for group "Owned"
|
||||
Then I should see the "Can not leave message"
|
||||
|
||||
@javascript
|
||||
Scenario: Guest should be able to leave from group
|
||||
Given "Mary Jane" is guest of group "Guest"
|
||||
When I visit dashboard groups page
|
||||
Then I should see group "Owned" in group list
|
||||
Then I should see group "Guest" in group list
|
||||
When I click on the "Leave" button for group "Guest"
|
||||
When I visit dashboard groups page
|
||||
Then I should see group "Owned" in group list
|
||||
Then I should not see group "Guest" in group list
|
||||
|
||||
@javascript
|
||||
Scenario: Guest should be able to leave from group even if he is the only user in the group
|
||||
When I visit dashboard groups page
|
||||
Then I should see group "Owned" in group list
|
||||
Then I should see group "Guest" in group list
|
||||
When I click on the "Leave" button for group "Guest"
|
||||
When I visit dashboard groups page
|
||||
Then I should see group "Owned" in group list
|
||||
Then I should not see group "Guest" in group list
|
||||
|
||||
Scenario: Create a group from dasboard
|
||||
And I visit dashboard groups page
|
||||
And I click new group link
|
||||
And submit form with new group "Samurai" info
|
||||
Then I should be redirected to group "Samurai" page
|
||||
And I should see newly created group "Samurai"
|
||||
|
||||
|
|
|
@ -4,44 +4,6 @@ class Spinach::Features::DashboardGroup < Spinach::FeatureSteps
|
|||
include SharedPaths
|
||||
include SharedUser
|
||||
|
||||
# Leave
|
||||
|
||||
step 'I click on the "Leave" button for group "Owned"' do
|
||||
find(:css, 'li', text: "Owner").find(:css, 'i.fa.fa-sign-out').click
|
||||
# poltergeist always confirms popups.
|
||||
end
|
||||
|
||||
step 'I click on the "Leave" button for group "Guest"' do
|
||||
find(:css, 'li', text: "Guest").find(:css, 'i.fa.fa-sign-out').click
|
||||
# poltergeist always confirms popups.
|
||||
end
|
||||
|
||||
step 'I should not see the "Leave" button for group "Owned"' do
|
||||
expect(find(:css, 'li', text: "Owner")).not_to have_selector(:css, 'i.fa.fa-sign-out')
|
||||
# poltergeist always confirms popups.
|
||||
end
|
||||
|
||||
step 'I should not see the "Leave" button for groupr "Guest"' do
|
||||
expect(find(:css, 'li', text: "Guest")).not_to have_selector(:css, 'i.fa.fa-sign-out')
|
||||
# poltergeist always confirms popups.
|
||||
end
|
||||
|
||||
step 'I should see group "Owned" in group list' do
|
||||
expect(page).to have_content("Owned")
|
||||
end
|
||||
|
||||
step 'I should not see group "Owned" in group list' do
|
||||
expect(page).not_to have_content("Owned")
|
||||
end
|
||||
|
||||
step 'I should see group "Guest" in group list' do
|
||||
expect(page).to have_content("Guest")
|
||||
end
|
||||
|
||||
step 'I should not see group "Guest" in group list' do
|
||||
expect(page).not_to have_content("Guest")
|
||||
end
|
||||
|
||||
step 'I click new group link' do
|
||||
click_link "New Group"
|
||||
end
|
||||
|
@ -60,8 +22,4 @@ class Spinach::Features::DashboardGroup < Spinach::FeatureSteps
|
|||
expect(page).to have_content "Samurai"
|
||||
expect(page).to have_content "Tokugawa Shogunate"
|
||||
end
|
||||
|
||||
step 'I should see the "Can not leave message"' do
|
||||
expect(page).to have_content "You can not leave the \"Owned\" group."
|
||||
end
|
||||
end
|
||||
|
|
|
@ -118,9 +118,7 @@ describe Groups::GroupMembersController do
|
|||
it 'cannot removes himself from the group' do
|
||||
delete :leave, group_id: group
|
||||
|
||||
expect(response).to redirect_to(group_path(group))
|
||||
expect(response).to set_flash[:alert].to "You can not leave the \"#{group.name}\" group. Transfer or delete the group."
|
||||
expect(group.users).to include user
|
||||
expect(response.status).to eq(403)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -171,11 +171,7 @@ describe Projects::ProjectMembersController do
|
|||
delete :leave, namespace_id: project.namespace,
|
||||
project_id: project
|
||||
|
||||
expect(response).to redirect_to(
|
||||
namespace_project_path(project.namespace, project)
|
||||
)
|
||||
expect(response).to set_flash[:alert].to "You can not leave the \"#{project.human_name}\" project. Transfer or delete the project."
|
||||
expect(project.users).to include user
|
||||
expect(response.status).to eq(403)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ feature 'Groups > Members > Member leaves group', feature: true do
|
|||
end
|
||||
|
||||
scenario 'user leaves group' do
|
||||
# find('#group-settings-button').click
|
||||
click_link 'Leave Group'
|
||||
|
||||
expect(current_path).to eq(dashboard_groups_path)
|
||||
|
|
|
@ -70,22 +70,6 @@ feature 'Project', feature: true do
|
|||
end
|
||||
end
|
||||
|
||||
describe 'leave project link' do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, namespace: user.namespace) }
|
||||
|
||||
before do
|
||||
login_with(user)
|
||||
project.team.add_user(user, Gitlab::Access::MASTER)
|
||||
visit namespace_project_path(project.namespace, project)
|
||||
end
|
||||
|
||||
it 'click project-settings and find leave project' do
|
||||
find('#project-settings-button').click
|
||||
expect(page).to have_link('Leave Project')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'project title' do
|
||||
include WaitForAjax
|
||||
|
||||
|
|
Loading…
Reference in New Issue