refactored add and updateVariable code and added tests

Author: c33s

lib/Gitlab/Api/Projects.php

@@ -568,14 +568,22 @@ public function variable($project_id, $key)
      * @param string $environment_scope
      * @return mixed
      */
-    public function addVariable($project_id, $key, $value, $protected = false, $environment_scope ="*")
+    public function addVariable($project_id, $key, $value, $protected = null, $environment_scope = null)
     {
-        return $this->post($this->getProjectPath($project_id, 'variables'), array(
+        $payload = array(
             'key'   => $key,
             'value' => $value,
-            'protected' => $protected,
-            'environment_scope' => $environment_scope,
-        ));
+        );
+
+        if ($protected) {
+            $payload['protected'] = $protected;
+        }
+
+        if ($environment_scope) {
+            $payload['environment_scope'] = $environment_scope;
+        }
+
+        return $this->post($this->getProjectPath($project_id, 'variables'), $payload);
     }
 
     /**
@@ -590,8 +598,8 @@ public function updateVariable($project_id, $key, $value, $protected = false, $e
     {
         return $this->put($this->getProjectPath($project_id, 'variables/'.$this->encodePath($key)), array(
             'value' => $value,
-            'protected' => $protected,
-            'environment_scope' => $environment_scope,
+//            'protected' => $protected,
+//            'environment_scope' => $environment_scope,
         ));
     }
 

test/Gitlab/Tests/Api/ProjectsTest.php

@@ -865,6 +865,84 @@ public function shouldAddVariable()
         $this->assertEquals($expectedArray, $api->addVariable(1, $expectedKey, $expectedValue));
     }
 
+    /**
+     * @test
+     */
+    public function shouldAddVariableWithProtected()
+    {
+        $expectedKey   = 'ftp_port';
+        $expectedValue = '21';
+        $expectedProtection = true;
+
+        $expectedArray = array(
+            'key'   => $expectedKey,
+            'value' => $expectedValue,
+            'protected' => true,
+        );
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('post')
+            ->with('projects/1/variables', $expectedArray)
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->addVariable(1, $expectedKey, $expectedValue, $expectedProtection));
+    }
+
+    /**
+     * @test
+     */
+    public function shouldAddVariableWithEnvironment()
+    {
+        $expectedKey   = 'ftp_port';
+        $expectedValue = '21';
+        $expectedProtection = null;
+        $expectedEnvironment = 'production';
+
+        $expectedArray = array(
+            'key'   => $expectedKey,
+            'value' => $expectedValue,
+            'environment_scope' => $expectedEnvironment,
+        );
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('post')
+            ->with('projects/1/variables', $expectedArray)
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->addVariable(1, $expectedKey, $expectedValue, $expectedProtection, $expectedEnvironment));
+    }
+
+    /**
+     * @test
+     */
+    public function shouldAddVariableWithProtectionAndEnvironment()
+    {
+        $expectedKey   = 'ftp_port';
+        $expectedValue = '21';
+        $expectedProtection = true;
+        $expectedEnvironment = 'production';
+
+        $expectedArray = array(
+            'key'   => $expectedKey,
+            'value' => $expectedValue,
+            'protected' => true,
+            'environment_scope' => $expectedEnvironment,
+        );
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('post')
+            ->with('projects/1/variables', $expectedArray)
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->addVariable(1, $expectedKey, $expectedValue, $expectedProtection, $expectedEnvironment));
+    }
+
     /**
      * @test
      */