Skip to content

Commit

Permalink
Merge pull request #22 from jhmartin/chefspec_fixes
Browse files Browse the repository at this point in the history
Chefspec fixes
  • Loading branch information
John Bellone committed Jul 14, 2014
2 parents b21d6bb + 61855cd commit 5450f6f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion spec/unit/attributes/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
let(:chef_run) { ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04').converge(described_recipe) }

context 'sets default attributes' do
it { expect(default_cookbook_attribute('base_url').to eq('https://dl.bintray.com/mitchellh/consul/'))}
it { expect(chef_run.node.consul.base_url).to eq('https://dl.bintray.com/mitchellh/consul/') }
end
end
12 changes: 8 additions & 4 deletions spec/unit/recipes/install_source_spec.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
require 'spec_helper'

describe_recipe 'consul::install_binary' do
describe_recipe 'consul::install_source' do
before do
stub_command("/usr/local/go/bin/go version | grep \"go1.2 \"").and_return(false)
end

it { expect(chef_run).to include_recipe('golang::default') }
it { expect(chef_run).to create_directory("#{node[:golang][:gohome]}/src/github.com/hashicorp") }
it { expect(chef_run).to checkout_git('https://github.com/hashicorp/consul.git') }
it { expect(chef_run.link('/usr/bin/local/consul')).to link_to('/opt/go/bin') }
it { expect(chef_run).to create_directory('/opt/go/src/github.com/hashicorp') }
it { expect(chef_run).to checkout_git('/opt/go/src/github.com/hashicorp/consul') }
it { expect(chef_run.link('/usr/local/bin/consul')).to link_to('/opt/go/bin/consul') }
it { expect(chef_run).to include_recipe('consul::_service') }
end

0 comments on commit 5450f6f

Please sign in to comment.