Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 15 deletions

diff --git a/spec/controllers/projects/pages_domains_controller_spec.rb b/spec/controllers/projects/pages_domains_controller_spec.rb
index 3987bebb124..ef6a193e677 100644
--- a/spec/controllers/projects/pages_domains_controller_spec.rb
+++ b/spec/controllers/projects/pages_domains_controller_spec.rb
@@ -32,10 +32,11 @@ describe Projects::PagesDomainsController do
       get(:show, params: request_params.merge(id: pages_domain.domain))
     end
 
-    it "redirects to the 'edit' page" do
+    it "displays to the 'show' page" do
       make_request
 
-      expect(response).to redirect_to(edit_project_pages_domain_path(project, pages_domain.domain))
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to render_template('show')
     end
 
     context 'when user is developer' do
@@ -69,16 +70,16 @@ describe Projects::PagesDomainsController do
       created_domain = PagesDomain.reorder(:id).last
 
       expect(created_domain).to be_present
-      expect(response).to redirect_to(edit_project_pages_domain_path(project, created_domain))
+      expect(response).to redirect_to(project_pages_domain_path(project, created_domain))
     end
   end
 
-  describe 'GET edit' do
-    it "displays the 'edit' page" do
-      get(:edit, params: request_params.merge(id: pages_domain.domain))
+  describe 'GET show' do
+    it "displays the 'show' page" do
+      get(:show, params: request_params.merge(id: pages_domain.domain))
 
       expect(response).to have_gitlab_http_status(200)
-      expect(response).to render_template('edit')
+      expect(response).to render_template('show')
     end
   end
 
@@ -128,10 +129,10 @@ describe Projects::PagesDomainsController do
     context 'the domain is invalid' do
       let(:pages_domain_params) { { user_provided_certificate: 'blabla' } }
 
-      it 'renders the edit action' do
+      it 'renders the show action' do
         patch(:update, params: params)
 
-        expect(response).to render_template('edit')
+        expect(response).to render_template('show')
       end
     end
 
@@ -160,7 +161,7 @@ describe Projects::PagesDomainsController do
 
       post :verify, params: params
 
-      expect(response).to redirect_to edit_project_pages_domain_path(project, pages_domain)
+      expect(response).to redirect_to project_pages_domain_path(project, pages_domain)
       expect(flash[:notice]).to eq('Successfully verified domain ownership')
     end
 
@@ -169,7 +170,7 @@ describe Projects::PagesDomainsController do
 
       post :verify, params: params
 
-      expect(response).to redirect_to edit_project_pages_domain_path(project, pages_domain)
+      expect(response).to redirect_to project_pages_domain_path(project, pages_domain)
       expect(flash[:alert]).to eq('Failed to verify domain ownership')
     end
 
@@ -195,10 +196,10 @@ describe Projects::PagesDomainsController do
       delete(:clean_certificate, params: request_params.merge(id: pages_domain.domain))
     end
 
-    it 'redirects to edit page' do
+    it 'redirects to show page' do
       subject
 
-      expect(response).to redirect_to(edit_project_pages_domain_path(project, pages_domain))
+      expect(response).to redirect_to(project_pages_domain_path(project, pages_domain))
     end
 
     it 'removes certificate' do
@@ -230,12 +231,12 @@ describe Projects::PagesDomainsController do
         expect(pages_domain.key).to be_present
       end
 
-      it 'redirects to edit page with a flash message' do
+      it 'redirects to show page with a flash message' do
         subject
 
         expect(flash[:alert]).to include('Certificate')
         expect(flash[:alert]).to include('Key')
-        expect(response).to redirect_to(edit_project_pages_domain_path(project, pages_domain))
+        expect(response).to redirect_to(project_pages_domain_path(project, pages_domain))
       end
     end
   end