summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-01 22:35:00 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-05 18:58:21 +0100
commit18232d7efb53381dea8727c36fc7a36dd2fd9d5e (patch)
tree3ac8700de4e27b9195c093b0b60d58cc1994dd43 /spec/controllers
parent434a6158ad08104662539d11a574f12668b3e6a5 (diff)
downloadgitlab-ce-18232d7efb53381dea8727c36fc7a36dd2fd9d5e.tar.gz
Extract Variable into separate JSON Schema
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/groups/variables_controller_spec.rb6
-rw-r--r--spec/controllers/projects/variables_controller_spec.rb6
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/groups/variables_controller_spec.rb b/spec/controllers/groups/variables_controller_spec.rb
index 94d13b632cd..80b6be39291 100644
--- a/spec/controllers/groups/variables_controller_spec.rb
+++ b/spec/controllers/groups/variables_controller_spec.rb
@@ -19,7 +19,7 @@ describe Groups::VariablesController do
it 'renders the ci_group_variable as json' do
subject
- expect(response).to match_response_schema('variable')
+ expect(response).to match_response_schema('variables')
end
end
@@ -85,7 +85,7 @@ describe Groups::VariablesController do
it 'has all variables in response' do
subject
- expect(response).to match_response_schema('variable')
+ expect(response).to match_response_schema('variables')
end
end
@@ -111,7 +111,7 @@ describe Groups::VariablesController do
it 'has all variables in response' do
subject
- expect(json_response['variables'].count).to eq(0)
+ expect(response).to match_response_schema('variables')
end
end
end
diff --git a/spec/controllers/projects/variables_controller_spec.rb b/spec/controllers/projects/variables_controller_spec.rb
index 4dbcfb125a2..0082757a5c6 100644
--- a/spec/controllers/projects/variables_controller_spec.rb
+++ b/spec/controllers/projects/variables_controller_spec.rb
@@ -24,7 +24,7 @@ describe Projects::VariablesController do
it 'renders the ci_variable as json' do
subject
- expect(response).to match_response_schema('variable')
+ expect(response).to match_response_schema('variables')
end
end
@@ -94,7 +94,7 @@ describe Projects::VariablesController do
it 'has all variables in response' do
subject
- expect(response).to match_response_schema('variable')
+ expect(response).to match_response_schema('variables')
end
end
@@ -120,7 +120,7 @@ describe Projects::VariablesController do
it 'has all variables in response' do
subject
- expect(json_response['variables'].count).to eq(0)
+ expect(response).to match_response_schema('variables')
end
end
end