Merge branch 'adapt_test_to_new_repo' into 'master'

Adapt the tests to the latest gitlab-git-test repo

See merge request !10

Author: jacobvosmaer

spec/commit_spec.rb

@@ -183,7 +183,7 @@
           commits.map { |c| c.id }
         end
 
-        it { should have(15).elements }
+        it { should have(16).elements }
         it { should include(SeedRepo::Commit::ID) }
         it { should include(SeedRepo::Commit::PARENT_ID) }
         it { should include(SeedRepo::FirstCommit::ID) }
@@ -201,7 +201,7 @@
           commits.map { |c| c.id }
         end
 
-        it { should have(12).elements }
+        it { should have(13).elements }
         it { should include(SeedRepo::Commit::ID) }
         it { should include(SeedRepo::FirstCommit::ID) }
         it { should_not include(SeedRepo::LastCommit::ID) }

spec/diff_spec.rb

@@ -25,7 +25,7 @@
       deleted_file: false,
     }
 
-    @rugged_diff = repository.rugged.diff("master^", "master", paths:
+    @rugged_diff = repository.rugged.diff("5937ac0a7beb003549fc5fd26fc247adbce4a52e^", "5937ac0a7beb003549fc5fd26fc247adbce4a52e", paths:
                                           [".gitmodules"]).patches.first
   end
 

spec/repository_spec.rb

@@ -58,13 +58,13 @@
 
     it { should be_kind_of Array }
     it { should have(SeedRepo::Repo::TAGS.size).elements }
-    its(:last) { should == "v1.1.0" }
+    its(:last) { should == "v1.2.0" }
     it { should include("v1.0.0") }
     it { should_not include("v5.0.0") }
   end
 
   shared_examples 'archive check' do |extenstion|
-    it { archive.should match(/tmp\/gitlab-git-test.git\/gitlab-git-test-5937ac0a/) }
+    it { archive.should match(/tmp\/gitlab-git-test.git\/gitlab-git-test-eb49186cfa5c43380/) }
     it { archive.should end_with extenstion }
     it { File.exists?(archive).should be_true }
     it { File.size?(archive).should_not be_nil }
@@ -138,7 +138,7 @@
 
     it { should be_kind_of Array }
     its(:first) { should == 'feature' }
-    its(:last) { should == 'v1.1.0' }
+    its(:last) { should == 'v1.2.0' }
   end
 
   describe :search_files do
@@ -181,12 +181,12 @@
   end
 
   describe :commit_count do
-    it { repository.commit_count("master").should == 13 }
+    it { repository.commit_count("master").should == 14 }
     it { repository.commit_count("feature").should == 9 }
   end
 
   describe :archive_repo do
-    it { repository.archive_repo('master', '/tmp').should == '/tmp/gitlab-git-test.git/gitlab-git-test-5937ac0a7beb003549fc5fd26fc247adbce4a52e.tar.gz' }
+    it { repository.archive_repo('master', '/tmp').should == '/tmp/gitlab-git-test.git/gitlab-git-test-eb49186cfa5c4338011f5f590fac11bd66c5c631.tar.gz' }
   end
 
   describe "#reset" do
@@ -212,7 +212,7 @@
         end
 
         @normal_repo = Gitlab::Git::Repository.new(TEST_NORMAL_REPO_PATH)
-        @normal_repo.reset("HEAD~3", :hard)
+        @normal_repo.reset("HEAD~4", :hard)
       end
 
       it "should replace the working directory with the content of the index" do

spec/support/big_commit.rb

@@ -1,4 +1,5 @@
 # Seed repo:
+# eb49186cfa5c4338011f5f590fac11bd66c5c631 Add submodules nested deeper than the root
 # 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
 # 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
 # 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules

spec/support/commit.rb

@@ -1,4 +1,5 @@
 # Seed repo:
+# eb49186cfa5c4338011f5f590fac11bd66c5c631 Add submodules nested deeper than the root
 # 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
 # 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
 # 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules

spec/support/first_commit.rb

@@ -1,4 +1,5 @@
 # Seed repo:
+# eb49186cfa5c4338011f5f590fac11bd66c5c631 Add submodules nested deeper than the root
 # 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
 # 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
 # 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules

spec/support/last_commit.rb

@@ -1,4 +1,5 @@
 # Seed repo:
+# eb49186cfa5c4338011f5f590fac11bd66c5c631 Add submodules nested deeper than the root
 # 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
 # 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
 # 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules
@@ -15,11 +16,11 @@
 #
 module SeedRepo
   module LastCommit
-    ID = "5937ac0a7beb003549fc5fd26fc247adbce4a52e"
-    PARENT_ID = "570e7b2abdd848b95f2f578043fc23bd6f6fd24d"
-    MESSAGE = "Add submodule from gitlab.com"
-    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets"
-    FILES = [".gitmodules", "gitlab-grack"]
-    FILES_COUNT = 2
+    ID = "eb49186cfa5c4338011f5f590fac11bd66c5c631"
+    PARENT_ID = "5937ac0a7beb003549fc5fd26fc247adbce4a52e"
+    MESSAGE = "Add submodules nested deeper than the root"
+    AUTHOR_FULL_NAME = "Jacob Vosmaer"
+    FILES = [".gitmodules", "deeper/nested/six", "nested/six"]
+    FILES_COUNT = 3
   end
 end

spec/support/repo.rb

@@ -2,7 +2,7 @@ module SeedRepo
   module Repo
     HEAD = "master"
     BRANCHES = ["feature", "fix", "master"]
-    TAGS = ["v1.0.0", 'v1.1.0']
+    TAGS = ["v1.0.0", 'v1.1.0', 'v1.2.0']
   end
 end
 

spec/tag_spec.rb

@@ -14,10 +14,10 @@
   describe 'last tag' do
     let(:tag) { repository.tags.last }
 
-    it { tag.name.should == "v1.1.0" }
-    it { tag.target.should == "8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b" }
-    it { tag.message.should == "Version 1.1.0" }
+    it { tag.name.should == "v1.2.0" }
+    it { tag.target.should == "10d64eed7760f2811ee2d64b44f1f7d3b364f17b" }
+    it { tag.message.should == "Version 1.2.0" }
   end
 
-  it { repository.tags.size.should == 2 }
+  it { repository.tags.size.should == 3 }
 end