summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/project_members_controller_spec.rb
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-07-07 14:40:41 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-07 14:40:41 +0000
commit64e589c581589e42dfa1b12a22011f88cd3e62bc (patch)
tree8df4fdce797c360d2a6256857db1c02c8b3d52f4 /spec/controllers/projects/project_members_controller_spec.rb
parent86fc4a1f3c8a72ba361d7fa64551c9d1522c255e (diff)
downloadgitlab-ce-64e589c581589e42dfa1b12a22011f88cd3e62bc.tar.gz
Resolve "Inconsistent location of members page between groups and projects"
Diffstat (limited to 'spec/controllers/projects/project_members_controller_spec.rb')
-rw-r--r--spec/controllers/projects/project_members_controller_spec.rb15
1 files changed, 7 insertions, 8 deletions
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index 548ec8f487f..8671d7a78dd 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -5,11 +5,10 @@ describe Projects::ProjectMembersController do
let(:project) { create(:empty_project, :public, :access_requestable) }
describe 'GET index' do
- it 'should have the settings/members address with a 302 status code' do
+ it 'should have the project_members address with a 200 status code' do
get :index, namespace_id: project.namespace, project_id: project
- expect(response).to have_http_status(302)
- expect(response.location).to include project_settings_members_path(project)
+ expect(response).to have_http_status(200)
end
end
@@ -50,7 +49,7 @@ describe Projects::ProjectMembersController do
access_level: Gitlab::Access::GUEST
expect(response).to set_flash.to 'Users were successfully added.'
- expect(response).to redirect_to(project_settings_members_path(project))
+ expect(response).to redirect_to(project_project_members_path(project))
end
it 'adds no user to members' do
@@ -62,7 +61,7 @@ describe Projects::ProjectMembersController do
access_level: Gitlab::Access::GUEST
expect(response).to set_flash.to 'Message'
- expect(response).to redirect_to(project_settings_members_path(project))
+ expect(response).to redirect_to(project_project_members_path(project))
end
end
end
@@ -111,7 +110,7 @@ describe Projects::ProjectMembersController do
id: member
expect(response).to redirect_to(
- project_settings_members_path(project)
+ project_project_members_path(project)
)
expect(project.members).not_to include member
end
@@ -253,7 +252,7 @@ describe Projects::ProjectMembersController do
id: member
expect(response).to redirect_to(
- project_settings_members_path(project)
+ project_project_members_path(project)
)
expect(project.members).to include member
end
@@ -290,7 +289,7 @@ describe Projects::ProjectMembersController do
expect(project.team_members).to include member
expect(response).to set_flash.to 'Successfully imported'
expect(response).to redirect_to(
- project_settings_members_path(project)
+ project_project_members_path(project)
)
end
end