summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-03 14:28:44 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-02-09 11:09:16 +0000
commitefa0502386a1868f7120ffd4291175291f0094ed (patch)
treee3408edb00847ee7134111ac4ec61f14f6fb435d /spec/controllers
parent0fddece769352b650c01d3a0920eea05f378b940 (diff)
downloadgitlab-ce-efa0502386a1868f7120ffd4291175291f0094ed.tar.gz
Enable grouping and pagination in environmnets API
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/environments_controller_spec.rb26
1 files changed, 18 insertions, 8 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 7ac1d62d1b1..4ec91738b9b 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -3,9 +3,13 @@ require 'spec_helper'
describe Projects::EnvironmentsController do
include ApiHelpers
- let(:environment) { create(:environment) }
- let(:project) { environment.project }
- let(:user) { create(:user) }
+ let(:user) { create(:user) }
+ let(:project) { create(:empty_project) }
+
+ let(:environment) do
+ create(:environment, name: 'production',
+ project: project)
+ end
before do
project.team << [user, :master]
@@ -22,14 +26,20 @@ describe Projects::EnvironmentsController do
end
end
- context 'when requesting JSON response' do
+ context 'when requesting JSON response for folders' do
+ before do
+ create(:environment, project: project, name: 'staging/review-1')
+ create(:environment, project: project, name: 'staging/review-2')
+ end
+
it 'responds with correct JSON' do
get :index, environment_params(format: :json)
- first_environment = json_response.first
-
- expect(first_environment).not_to be_empty
- expect(first_environment['name']). to eq environment.name
+ expect(json_response.count).to eq 2
+ expect(json_response.first['name']).to eq 'production'
+ expect(json_response.second['name']).to eq 'staging'
+ expect(json_response.second['size']).to eq 2
+ expect(json_response.second['latest']['name']).to eq 'staging/review-2'
end
end
end