Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Fargher <proglottis@gmail.com>2019-05-03 00:30:53 +0300
committerJames Fargher <proglottis@gmail.com>2019-05-06 23:37:04 +0300
commitc40a99a05842d0976dd1bca532fbc67c0ccee04d (patch)
treea3d126281982d9efa18aac1842ea5a6734d9fd8c /spec/controllers
parent265dee5cc6a298370d708acdd11ee56997667332 (diff)
Change specs to match gitlab code standards
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/admin/clusters_controller_spec.rb20
-rw-r--r--spec/controllers/concerns/enforces_admin_authentication_spec.rb2
2 files changed, 12 insertions, 10 deletions
diff --git a/spec/controllers/admin/clusters_controller_spec.rb b/spec/controllers/admin/clusters_controller_spec.rb
index e5fcc475d99..7b77cb186a4 100644
--- a/spec/controllers/admin/clusters_controller_spec.rb
+++ b/spec/controllers/admin/clusters_controller_spec.rb
@@ -12,7 +12,7 @@ describe Admin::ClustersController do
sign_in(admin)
end
- describe 'GET index' do
+ describe 'GET #index' do
def get_index(params = {})
get :index, params: params
end
@@ -22,7 +22,7 @@ describe Admin::ClustersController do
stub_feature_flags(instance_clusters: false)
end
- it 'renders 404' do
+ it 'responds with not found' do
get_index
expect(response).to have_gitlab_http_status(404)
@@ -90,7 +90,7 @@ describe Admin::ClustersController do
end
end
- describe 'GET new' do
+ describe 'GET #new' do
def get_new
get :new
end
@@ -166,7 +166,7 @@ describe Admin::ClustersController do
end
end
- describe 'POST create for new cluster' do
+ describe 'POST #create_gcp' do
let(:legacy_abac_param) { 'true' }
let(:params) do
{
@@ -251,7 +251,7 @@ describe Admin::ClustersController do
end
end
- describe 'POST create for existing cluster' do
+ describe 'POST #create_user' do
let(:params) do
{
cluster: {
@@ -321,7 +321,7 @@ describe Admin::ClustersController do
end
end
- describe 'GET cluster_status' do
+ describe 'GET #cluster_status' do
let(:cluster) { create(:cluster, :providing_by_gcp, :instance) }
def get_cluster_status
@@ -354,7 +354,7 @@ describe Admin::ClustersController do
end
end
- describe 'GET show' do
+ describe 'GET #show' do
let(:cluster) { create(:cluster, :provided_by_gcp, :instance) }
def get_show
@@ -365,7 +365,7 @@ describe Admin::ClustersController do
end
describe 'functionality' do
- it 'renders view' do
+ it 'responds successfully' do
get_show
expect(response).to have_gitlab_http_status(:ok)
@@ -380,7 +380,7 @@ describe Admin::ClustersController do
end
end
- describe 'PUT update' do
+ describe 'PUT #update' do
def put_update(format: :html)
put :update, params: params.merge(
id: cluster,
@@ -476,7 +476,7 @@ describe Admin::ClustersController do
end
end
- describe 'DELETE destroy' do
+ describe 'DELETE #destroy' do
let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, :instance) }
def delete_destroy
diff --git a/spec/controllers/concerns/enforces_admin_authentication_spec.rb b/spec/controllers/concerns/enforces_admin_authentication_spec.rb
index 9025293f9ea..e6a6702fdea 100644
--- a/spec/controllers/concerns/enforces_admin_authentication_spec.rb
+++ b/spec/controllers/concerns/enforces_admin_authentication_spec.rb
@@ -24,6 +24,7 @@ describe EnforcesAdminAuthentication do
it 'renders ok' do
get :index
+
expect(response).to have_gitlab_http_status(200)
end
end
@@ -31,6 +32,7 @@ describe EnforcesAdminAuthentication do
context 'as a user' do
it 'renders a 404' do
get :index
+
expect(response).to have_gitlab_http_status(404)
end
end