summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-05-22 08:24:08 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-05-22 08:28:21 +0200
commit6432d36123aacf0b2b5db1381c8431a1762bb587 (patch)
treec523b25891b2dfc77fb4bdcac2b7445b96c7d1d5
parent2792695cfa357c5d269dc3218195c33f5bc15d0a (diff)
downloadgitlab-ce-zj-sort-env-folders.tar.gz
Improve test wordingzj-sort-env-folders
-rw-r--r--spec/controllers/projects/environments_controller_spec.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 93dbedae2b2..0f077176e49 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -1,25 +1,25 @@
require 'spec_helper'
describe Projects::EnvironmentsController do
- let(:user) { create(:user) }
- let(:project) { create(:empty_project) }
+ set(:user) { create(:user) }
+ set(:project) { create(:empty_project) }
- let(:environment) do
+ set(:environment) do
create(:environment, name: 'production', project: project)
end
- before do
- project.team << [user, :master]
+ before(:all) do
+ project.add_master(user)
sign_in(user)
end
describe 'GET index' do
- context 'when standardrequest has been made' do
+ context 'when a request for the HTML is made' do
it 'responds with status code 200' do
get :index, environment_params
- expect(response).to be_ok
+ expect(response).to have_http_status(:ok)
end
end
@@ -101,7 +101,7 @@ describe Projects::EnvironmentsController do
end
context 'when using JSON format' do
- it 'responds with with a sorted JSON' do
+ it 'sorts the subfolders lexicographically' do
get :folder, namespace_id: project.namespace,
project_id: project,
id: 'staging-1.0',