diff options
Diffstat (limited to 'spec/controllers/projects/pages_domains_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/pages_domains_controller_spec.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/spec/controllers/projects/pages_domains_controller_spec.rb b/spec/controllers/projects/pages_domains_controller_spec.rb index b9cf3e9b091..8b7f7587701 100644 --- a/spec/controllers/projects/pages_domains_controller_spec.rb +++ b/spec/controllers/projects/pages_domains_controller_spec.rb @@ -24,7 +24,7 @@ describe Projects::PagesDomainsController do describe 'GET show' do it "displays the 'show' page" do - get(:show, request_params.merge(id: pages_domain.domain)) + get(:show, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(200) expect(response).to render_template('show') @@ -33,7 +33,7 @@ describe Projects::PagesDomainsController do describe 'GET new' do it "displays the 'new' page" do - get(:new, request_params) + get(:new, params: request_params) expect(response).to have_gitlab_http_status(200) expect(response).to render_template('new') @@ -43,7 +43,7 @@ describe Projects::PagesDomainsController do describe 'POST create' do it "creates a new pages domain" do expect do - post(:create, request_params.merge(pages_domain: pages_domain_params)) + post(:create, params: request_params.merge(pages_domain: pages_domain_params)) end.to change { PagesDomain.count }.by(1) created_domain = PagesDomain.reorder(:id).last @@ -55,7 +55,7 @@ describe Projects::PagesDomainsController do describe 'GET edit' do it "displays the 'edit' page" do - get(:edit, request_params.merge(id: pages_domain.domain)) + get(:edit, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(200) expect(response).to render_template('edit') @@ -81,11 +81,11 @@ describe Projects::PagesDomainsController do .with(ActionController::Parameters.new(pages_domain_params).permit!) .and_return(true) - patch(:update, params) + patch(:update, params: params) end it 'redirects to the project page' do - patch(:update, params) + patch(:update, params: params) expect(flash[:notice]).to eq 'Domain was updated' expect(response).to redirect_to(project_pages_path(project)) @@ -95,7 +95,7 @@ describe Projects::PagesDomainsController do it 'renders the edit action' do allow(pages_domain).to receive(:update).and_return(false) - patch(:update, params) + patch(:update, params: params) expect(response).to render_template('edit') end @@ -108,7 +108,7 @@ describe Projects::PagesDomainsController do .with(hash_not_including(:domain)) .and_return(true) - patch(:update, params.deep_merge(pages_domain: { domain: 'abc' })) + patch(:update, params: params.deep_merge(pages_domain: { domain: 'abc' })) end end end @@ -127,7 +127,7 @@ describe Projects::PagesDomainsController do it 'handles verification success' do expect(stub_service).to receive(:execute).and_return(status: :success) - post :verify, params + post :verify, params: params expect(response).to redirect_to project_pages_domain_path(project, pages_domain) expect(flash[:notice]).to eq('Successfully verified domain ownership') @@ -136,14 +136,14 @@ describe Projects::PagesDomainsController do it 'handles verification failure' do expect(stub_service).to receive(:execute).and_return(status: :failed) - post :verify, params + post :verify, params: params expect(response).to redirect_to project_pages_domain_path(project, pages_domain) expect(flash[:alert]).to eq('Failed to verify domain ownership') end it 'returns a 404 response for an unknown domain' do - post :verify, request_params.merge(id: 'unknown-domain') + post :verify, params: request_params.merge(id: 'unknown-domain') expect(response).to have_gitlab_http_status(404) end @@ -152,7 +152,7 @@ describe Projects::PagesDomainsController do describe 'DELETE destroy' do it "deletes the pages domain" do expect do - delete(:destroy, request_params.merge(id: pages_domain.domain)) + delete(:destroy, params: request_params.merge(id: pages_domain.domain)) end.to change { PagesDomain.count }.by(-1) expect(response).to redirect_to(project_pages_path(project)) @@ -166,7 +166,7 @@ describe Projects::PagesDomainsController do describe 'GET show' do it 'returns 404 status' do - get(:show, request_params.merge(id: pages_domain.domain)) + get(:show, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(404) end @@ -174,7 +174,7 @@ describe Projects::PagesDomainsController do describe 'GET new' do it 'returns 404 status' do - get :new, request_params + get :new, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -182,7 +182,7 @@ describe Projects::PagesDomainsController do describe 'POST create' do it "returns 404 status" do - post(:create, request_params.merge(pages_domain: pages_domain_params)) + post(:create, params: request_params.merge(pages_domain: pages_domain_params)) expect(response).to have_gitlab_http_status(404) end @@ -190,7 +190,7 @@ describe Projects::PagesDomainsController do describe 'DELETE destroy' do it "deletes the pages domain" do - delete(:destroy, request_params.merge(id: pages_domain.domain)) + delete(:destroy, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(404) end |