Merge pull request #394 from virtualtam/app-utils/check-update/stable-branch

application: default to the "stable" branch for update checks

1 files changed, 12 insertions, 2 deletions

diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 437c21fd..6064357d 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -75,7 +75,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     public function testGetLatestGitVersionCodeInvalidUrl()
     {
         $this->assertFalse(
-            ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 0)
+            ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 1)
         );
     }
 
@@ -102,7 +102,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     /**
      * A newer version is available
      */
-    public function testCheckUpdateNewVersionNew()
+    public function testCheckUpdateNewVersionAvailable()
     {
         $newVersion = '1.8.3';
         FakeApplicationUtils::$VERSION_CODE = $newVersion;
@@ -135,6 +135,16 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test update checks - invalid Git branch
+     * @expectedException              Exception
+     * @expectedExceptionMessageRegExp /Invalid branch selected for updates/
+     */
+    public function testCheckUpdateInvalidGitBranch()
+    {
+        ApplicationUtils::checkUpdate('', 'null', 0, true, true, 'unstable');
+    }
+
+    /**
      * Shaarli is up-to-date
      */
     public function testCheckUpdateNewVersionUpToDate()