Commit 4d734812 authored by Marin Jankovski's avatar Marin Jankovski

Fix packages spec for yum-epel.

parent 428edef6
...@@ -45,7 +45,7 @@ describe "gitlab::packages" do ...@@ -45,7 +45,7 @@ describe "gitlab::packages" do
it "includes recipes from external cookbooks" do it "includes recipes from external cookbooks" do
expect(chef_run).to_not include_recipe("apt::default") expect(chef_run).to_not include_recipe("apt::default")
expect(chef_run).to include_recipe("yum::epel") expect(chef_run).to include_recipe("yum-epel::default")
expect(chef_run).to include_recipe("gitlab::git") expect(chef_run).to include_recipe("gitlab::git")
expect(chef_run).to include_recipe("redisio::install") expect(chef_run).to include_recipe("redisio::install")
expect(chef_run).to include_recipe("redisio::enable") expect(chef_run).to include_recipe("redisio::enable")
......
...@@ -19,8 +19,8 @@ describe "gitlab::setup" do ...@@ -19,8 +19,8 @@ describe "gitlab::setup" do
before do before do
# stubbing commands because real commands are disabled # stubbing commands because real commands are disabled
stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.4.1.zip").and_return(true) stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
stub_command("git --version | grep 1.8.4.1").and_return(true) stub_command("git --version | grep 1.8.5.2").and_return(true)
stub_command("git --version >/dev/null").and_return(true) stub_command("git --version >/dev/null").and_return(true)
stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true) stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true)
stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true) stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true)
...@@ -89,8 +89,8 @@ describe "gitlab::setup" do ...@@ -89,8 +89,8 @@ describe "gitlab::setup" do
before do before do
# stubbing commands because real commands are disabled # stubbing commands because real commands are disabled
stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.4.1.zip").and_return(true) stub_command("test -f #{Chef::Config['file_cache_path']}/git-1.8.5.2.zip").and_return(true)
stub_command("git --version | grep 1.8.4.1").and_return(true) stub_command("git --version | grep 1.8.5.2").and_return(true)
stub_command("git --version >/dev/null").and_return(true) stub_command("git --version >/dev/null").and_return(true)
stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true) stub_command("/usr/bin/mysql -u root -e 'show databases;'").and_return(true)
stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true) stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'").and_return(true)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment