Merge pull request #554 from jvanbaarsen/fix-tests

Semaphore does not like real git fetching, stub out the call

3 files changed, 14 insertions, 5 deletions

diff --git a/.hound.yml b/.hound.yml
new file mode 100644
index 0000000..3bde29f
--- /dev/null
+++ b/.hound.yml
@@ -0,0 +1,4 @@
+# Prefer single quotes
+StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
diff --git a/lib/upgrader.rb b/lib/upgrader.rb
index 3dff6a8..3969fa2 100644
--- a/lib/upgrader.rb
+++ b/lib/upgrader.rb
@@ -41,8 +41,6 @@ class Upgrader
   end
 
   def latest_version_raw
-    git_tags = `git ls-remote --tags origin | grep tags\/v#{current_version.major}`
-    git_tags = git_tags.lines.to_a.select { |version| version =~ /v\d\.\d\.\d\Z/ }
     last_tag = git_tags.last.match(/v\d\.\d\.\d/).to_s
   end
 
@@ -91,4 +89,9 @@ class Upgrader
     end while !choices.include?(answer)
     answer
   end
+
+  def git_tags
+    tags = `git ls-remote --tags origin | grep tags\/v#{current_version.major}`
+    tags.lines.to_a.select { |version| version =~ /v\d\.\d\.\d\Z/ }
+  end
 end
diff --git a/spec/lib/upgrader_spec.rb b/spec/lib/upgrader_spec.rb
index 9674907..b37d0e4 100644
--- a/spec/lib/upgrader_spec.rb
+++ b/spec/lib/upgrader_spec.rb
@@ -16,9 +16,11 @@ describe Upgrader do
   end
 
   describe 'latest_version_raw' do
-    it 'should be latest version for GitLab 5' do
-      upgrader.stub(current_version_raw: "3.0.0")
-      upgrader.latest_version_raw.should == "v3.2.0"
+    it 'should be latest version for GitLab' do
+      upgrader.stub(current_version_raw: '3.0.0')
+      upgrader.stub(git_tags: [
+        '1b5bee25b51724214c7a3307ef94027ab93ec982        refs/tags/v7.8.1'])
+      upgrader.latest_version_raw.should == 'v7.8.1'
     end
   end
 end