No test failing with hg < 3, fix coding style

liip · Nov 16, 2015 · dc484ed · dc484ed
1 parent 778ca88
commit dc484ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Liip/RMT/Config/Handler.php b/src/Liip/RMT/Config/Handler.php
@@ -130,13 +130,13 @@ protected function validateRootElements($config)
             }
         }
 
-        if($config['version-generator'] == 'simple'
+        if ($config['version-generator'] == 'simple'
             && isset($config['vcs']) && $config['vcs'] == 'hg'
             && (! isset($config['version-persister']['tag-prefix']) || strlen(trim($config['version-persister']['tag-prefix'])) == 0))
         {
             exec('hg version', $result);
             preg_match('/version (\d+)\.\d+\.\d+/', reset($result), $matches);
-            if(intval($matches[1]) >= 3) {
+            if (intval($matches[1]) >= 3) {
                 throw new Exception("Simple generator is not compatible with mercurial > 3.");
             }
 

diff --git a/test/Liip/RMT/Tests/Functional/HgTest.php b/test/Liip/RMT/Tests/Functional/HgTest.php
@@ -27,7 +27,11 @@ public function testNoSimpleGenerator()
         $this->initHg();
         $this->createConfig('simple', 'vcs-tag', array('vcs' => 'hg'));
         exec('./RMT release -n --confirm-first', $result, $code);
-        $this->assertEquals($code, 1);
+
+        exec('hg version', $result);
+        preg_match('/version (\d+)\.\d+\.\d+/', reset($result), $matches);
+        $expected = $matches[1]) >= 3 ? 1 : 0;
+        $this->assertEquals($code, $expected);
     }
 
     public function testInitialVersion()