From 558057010f02fc931db08d8dedfc7cdeb6192ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com>
Date: Thu, 1 Feb 2018 21:58:05 +0100
Subject: [PATCH] Extract variable parameters in VariablesController specs

---
 .../groups/variables_controller_spec.rb       | 28 +++++++++----------
 .../projects/variables_controller_spec.rb     | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/spec/controllers/groups/variables_controller_spec.rb b/spec/controllers/groups/variables_controller_spec.rb
index f6bcc68f9ad..94d13b632cd 100644
--- a/spec/controllers/groups/variables_controller_spec.rb
+++ b/spec/controllers/groups/variables_controller_spec.rb
@@ -25,16 +25,22 @@ describe Groups::VariablesController do
 
   describe 'POST #update' do
     let!(:variable) { create(:ci_group_variable, group: group) }
+    let(:variable_attributes) do
+      { id: variable.id, key: variable.key,
+        value: variable.value,
+        protected: variable.protected?.to_s }
+    end
+    let(:new_variable_attributes) do
+      { key: 'new_key', value: 'dummy_value',
+        protected: 'false' }
+    end
 
     context 'with invalid new variable parameters' do
       subject do
         patch :update,
           group_id: group,
-          variables_attributes: [{ id: variable.id, key: variable.key,
-                                   value: 'other_value',
-                                   protected: variable.protected?.to_s },
-                                 { key: '..?', value: 'dummy_value',
-                                   protected: 'false' }],
+          variables_attributes: [variable_attributes.merge(value: 'other_value'),
+                                 new_variable_attributes.merge(key: '..?')],
           format: :json
       end
 
@@ -57,11 +63,8 @@ describe Groups::VariablesController do
       subject do
         patch :update,
           group_id: group,
-          variables_attributes: [{ id: variable.id, key: variable.key,
-                                   value: 'other_value',
-                                   protected: variable.protected?.to_s },
-                                 { key: 'new_key', value: 'dummy_value',
-                                   protected: 'false' }],
+          variables_attributes: [variable_attributes.merge(value: 'other_value'),
+                                 new_variable_attributes],
           format: :json
       end
 
@@ -90,10 +93,7 @@ describe Groups::VariablesController do
       subject do
         patch :update,
           group_id: group,
-          variables_attributes: [{ id: variable.id, key: variable.key,
-                                   value: variable.value,
-                                   protected: variable.protected?.to_s,
-                                   _destroy: 'true' }],
+          variables_attributes: [variable_attributes.merge(_destroy: 'true')],
           format: :json
       end
 
diff --git a/spec/controllers/projects/variables_controller_spec.rb b/spec/controllers/projects/variables_controller_spec.rb
index 8e5d6023b79..4dbcfb125a2 100644
--- a/spec/controllers/projects/variables_controller_spec.rb
+++ b/spec/controllers/projects/variables_controller_spec.rb
@@ -30,6 +30,15 @@ describe Projects::VariablesController do
 
   describe 'POST #update' do
     let(:variable) { create(:ci_variable) }
+    let(:variable_attributes) do
+      { id: variable.id, key: variable.key,
+        value: variable.value,
+        protected: variable.protected?.to_s }
+    end
+    let(:new_variable_attributes) do
+      { key: 'new_key', value: 'dummy_value',
+        protected: 'false' }
+    end
 
     before do
       project.variables << variable
@@ -39,11 +48,8 @@ describe Projects::VariablesController do
       subject do
         patch :update,
           namespace_id: project.namespace.to_param, project_id: project,
-          variables_attributes: [{ id: variable.id, key: variable.key,
-                                   value: 'other_value',
-                                   protected: variable.protected?.to_s },
-                                 { key: '..?', value: 'dummy_value',
-                                   protected: 'false' }],
+          variables_attributes: [variable_attributes.merge(value: 'other_value'),
+                                 new_variable_attributes.merge(key: '..?')],
           format: :json
       end
 
@@ -66,11 +72,8 @@ describe Projects::VariablesController do
       subject do
         patch :update,
           namespace_id: project.namespace.to_param, project_id: project,
-          variables_attributes: [{ id: variable.id, key: variable.key,
-                                   value: 'other_value',
-                                   protected: variable.protected?.to_s },
-                                 { key: 'new_key', value: 'dummy_value',
-                                   protected: 'false' }],
+          variables_attributes: [variable_attributes.merge(value: 'other_value'),
+                                 new_variable_attributes],
           format: :json
       end
 
@@ -99,10 +102,7 @@ describe Projects::VariablesController do
       subject do
         patch :update,
           namespace_id: project.namespace.to_param, project_id: project,
-          variables_attributes: [{ id: variable.id, key: variable.key,
-                                   value: variable.value,
-                                   protected: variable.protected?.to_s,
-                                   _destroy: 'true' }],
+          variables_attributes: [variable_attributes.merge(_destroy: 'true')],
           format: :json
       end
 
-- 
GitLab