Fix the tests

attributes/default.rb

@@ -72,11 +72,11 @@ if node['gitlab']['env'] == "development"
   default['gitlab']['shell_revision'] = "master"
 else
   default['gitlab']['environments'] = %w{production}
-  default['gitlab']['revision'] = "7-2-stable" # Must be branch, otherwise GitLab update will run on each chef run
+  default['gitlab']['revision'] = "7-3-stable" # Must be branch, otherwise GitLab update will run on each chef run
   default['gitlab']['url'] = "http://localhost:80/"
   default['gitlab']['port'] = "80"
   default['gitlab']['ssh_port'] = "22"
-  default['gitlab']['shell_revision'] = "v1.9.7"
+  default['gitlab']['shell_revision'] = "v2.0.0"
 end
 # Nginx ip

spec/clone_spec.rb

@@ -15,7 +15,7 @@ describe "gitlab::clone" do
       it "clones the gitlab repository" do
         expect(chef_run).to sync_git('/home/git/gitlab').with(
           repository: 'https://github.com/gitlabhq/gitlabhq.git',
-          revision: '7-2-stable',
+          revision: '7-3-stable',
           user: 'git',
           group: 'git'
         )
@@ -49,7 +49,7 @@ describe "gitlab::clone" do
         it "clones the gitlab repository" do
           expect(chef_run).to sync_git('/data/git/gitlab').with(
             repository: 'https://github.com/gitlabhq/gitlabhq.git',
-            revision: '7-2-stable',
+            revision: '7-3-stable',
             user: 'git',
             group: 'git'
           )
@@ -69,7 +69,7 @@ describe "gitlab::clone" do
       it "clones the gitlab repository" do
         expect(chef_run).to sync_git('/home/git/gitlab').with(
           repository: 'https://github.com/gitlabhq/gitlabhq.git',
-          revision: '7-2-stable',
+          revision: '7-3-stable',
           user: 'git',
           group: 'git'
         )
@@ -103,7 +103,7 @@ describe "gitlab::clone" do
         it "clones the gitlab repository" do
           expect(chef_run).to sync_git('/data/git/gitlab').with(
             repository: 'https://github.com/gitlabhq/gitlabhq.git',
-            revision: '7-2-stable',
+            revision: '7-3-stable',
             user: 'git',
             group: 'git'
           )

spec/gitlab_shell_clone_spec.rb

@@ -15,7 +15,7 @@ describe "gitlab::gitlab_shell_clone" do
       it "clones the gitlab-shell repository" do
         expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
           repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-          revision: "v1.9.7",
+          revision: "v2.0.0",
           user: 'git',
           group: 'git'
         )
@@ -64,7 +64,7 @@ describe "gitlab::gitlab_shell_clone" do
       it "clones the gitlab-shell repository" do
         expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
           repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-          revision: "v1.9.7",
+          revision: "v2.0.0",
           user: 'git',
           group: 'git'
         )

spec/gitlab_shell_install_spec.rb

@@ -24,6 +24,8 @@ describe "gitlab::gitlab_shell_install" do
             redis_host: "127.0.0.1",
             redis_port: "6379",
             redis_database: nil,
+            redis_port: "0",
+            redis_unixsocket: "/var/lib/redis/redis.sock",
             namespace: "resque:gitlab",
             self_signed_cert: false
           }
@@ -64,6 +66,7 @@ describe "gitlab::gitlab_shell_install" do
           runner.node.set['gitlab']['env'] = "production"
           runner.node.set['gitlab']['home'] = "/data/git"
           runner.node.set['gitlab']['redis_database'] = 2
+          runner.node.set['gitlab']['redis_unixsocket'] = "/var/lib/redis/redis.sock"
           runner.converge("gitlab::gitlab_shell_install")
         end
@@ -77,8 +80,9 @@ describe "gitlab::gitlab_shell_install" do
               repos_path: "/data/git/repositories",
               redis_path: "/usr/local/bin/redis-cli",
               redis_host: "127.0.0.1",
-              redis_port: "6379",
+              redis_port: "0",
               redis_database: 2,
+              redis_unixsocket: "/var/lib/redis/redis.sock",
               namespace: "resque:gitlab",
               self_signed_cert: false
             }
@@ -106,6 +110,7 @@ describe "gitlab::gitlab_shell_install" do
         runner = ChefSpec::Runner.new(platform: "centos", version: version)
         runner.node.set['gitlab']['env'] = "production"
         runner.node.set['gitlab']['redis_database'] = 3
+        runner.node.set['gitlab']['redis_unixsocket'] = "/var/lib/redis/redis.sock"
         runner.converge("gitlab::gitlab_shell_install")
       end
@@ -119,8 +124,9 @@ describe "gitlab::gitlab_shell_install" do
             repos_path: "/home/git/repositories",
             redis_path: "/usr/local/bin/redis-cli",
             redis_host: "127.0.0.1",
-            redis_port: "6379",
+            redis_port: "0",
             redis_database: 3,
+            redis_unixsocket: "/var/lib/redis/redis.sock",
             namespace: "resque:gitlab",
             self_signed_cert: false
           }
@@ -175,6 +181,8 @@ describe "gitlab::gitlab_shell_install" do
               redis_host: "127.0.0.1",
               redis_port: "6379",
               redis_database: nil,
+              redis_port: "0",
+              redis_unixsocket: "/var/lib/redis/redis.sock",
               namespace: "resque:gitlab",
               self_signed_cert: false
             }