diff options
author | Nick Thomas <nick@gitlab.com> | 2019-01-16 12:43:56 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-01-16 12:43:56 +0000 |
commit | eec16ee28c7b377101ab3d5f81835cd8c2020981 (patch) | |
tree | ec06ebb42167ccbaaa51216df9e1d0fbf94853e0 /spec | |
parent | 1a77ea20edf88f828a1f36f520285a50176e6e08 (diff) | |
parent | 322c70145abd1f86c1679da55e087ca062edaad7 (diff) | |
download | gitlab-ce-eec16ee28c7b377101ab3d5f81835cd8c2020981.tar.gz |
Merge branch 'ac-pages-subgroups' into 'master'
Enable Gitlab-Pages for subgroups
See merge request gitlab-org/gitlab-ce!23505
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/pages_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb index 382c1b5d124..4b742a5d427 100644 --- a/spec/controllers/projects/pages_controller_spec.rb +++ b/spec/controllers/projects/pages_controller_spec.rb @@ -28,10 +28,10 @@ describe Projects::PagesController do let(:group) { create(:group, :nested) } let(:project) { create(:project, namespace: group) } - it 'returns a 404 status code' do + it 'returns a 200 status code' do get :show, params: request_params - expect(response).to have_gitlab_http_status(404) + expect(response).to have_gitlab_http_status(200) end end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 397b4d7c61f..08eed9c06de 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3087,7 +3087,7 @@ describe Project do context 'when the project is in a subgroup' do let(:group) { create(:group, :nested) } - it { is_expected.to be(false) } + it { is_expected.to be(true) } end end |