Merges incoming changes

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

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