diff options
author | jhampton <jhampton@gitlab.com> | 2018-12-07 11:26:00 -0500 |
---|---|---|
committer | jhampton <jhampton@gitlab.com> | 2018-12-07 11:26:00 -0500 |
commit | 7ec485bdb2e2d3e360cd18219bffa2ee62b300b9 (patch) | |
tree | 6ea40e3925a0f6ef0c876887bbf9c35b0dafc390 | |
parent | 7fd0f503e6a7f212c341f8c8a7c0b078ad4ea459 (diff) | |
parent | 5de224e3dc11ab9dafb291417797f1404f6f4be9 (diff) | |
download | gitlab-ce-7ec485bdb2e2d3e360cd18219bffa2ee62b300b9.tar.gz |
Merges incoming changes
-rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/serializers/trigger_variable_entity_spec.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index 034ef102205..bd193979192 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -403,7 +403,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do create(:ci_pipeline_variable, pipeline: pipeline, key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1') end - context 'with variables and user is a maintainer' do + context 'user is a maintainer' do before do project.add_maintainer(user) @@ -429,7 +429,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end end - context 'with variables and user is not a mantainer' do + context 'user is not a mantainer' do before do get_show(id: job.id, format: :json) end diff --git a/spec/serializers/trigger_variable_entity_spec.rb b/spec/serializers/trigger_variable_entity_spec.rb index 198b3de4f3e..66567c05f52 100644 --- a/spec/serializers/trigger_variable_entity_spec.rb +++ b/spec/serializers/trigger_variable_entity_spec.rb @@ -14,6 +14,7 @@ describe TriggerVariableEntity do end it 'exposes the variable key' do + expect(subject).to include(:key) end context 'when user has access to the value' do |