From e7d7e2217d54d8c87dd9897f4fe1bfbdb5038d02 Mon Sep 17 00:00:00 2001 From: Bruce Williams Date: Thu, 18 Mar 2010 01:18:13 -0700 Subject: Fix bad context nesting --- spec/unit/puppet/provider/vcsrepo/git_spec.rb | 83 ++++++++++++++------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb index ada7e5c..aef3e91 100644 --- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb @@ -98,53 +98,54 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do end end end - - context 'destroying' do - it "it should remove the directory" do - expects_rm_rf - provider.destroy - end + + end + + context 'destroying' do + it "it should remove the directory" do + expects_rm_rf + provider.destroy end - - context "checking the revision property" do - context_with_resource :revision do - before do - expects_chdir - provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha') - end - - context "when its SHA is not different than the current SHA" do - it "should return the ref" do - provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('currentsha') - provider.revision.should == resource.value(:revision) - end + end + + context "checking the revision property" do + context_with_resource :revision do + before do + expects_chdir + provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha') + end + + context "when its SHA is not different than the current SHA" do + it "should return the ref" do + provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('currentsha') + provider.revision.should == resource.value(:revision) end - - context "when its SHA is different than the current SHA" do - it "should return the current SHA" do - provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('othersha') - provider.revision.should == 'currentsha' - end + end + + context "when its SHA is different than the current SHA" do + it "should return the current SHA" do + provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('othersha') + provider.revision.should == 'currentsha' end end end - - context "setting the revision property" do - it "should use 'git fetch' and 'git reset'" do - expects_chdir - provider.expects('git').with('fetch', 'origin') - provider.expects('git').with('reset', '--hard', 'carcar') - provider.revision = 'carcar' - end + end + + context "setting the revision property" do + it "should use 'git fetch' and 'git reset'" do + expects_chdir + provider.expects('git').with('fetch', 'origin') + provider.expects('git').with('reset', '--hard', 'carcar') + provider.revision = 'carcar' end - - context "updating references" do - it "should use 'git fetch --tags'" do - expects_chdir - provider.expects('git').with('fetch', '--tags', 'origin') - provider.update_references - end + end + + context "updating references" do + it "should use 'git fetch --tags'" do + expects_chdir + provider.expects('git').with('fetch', '--tags', 'origin') + provider.update_references end - end + end -- cgit v1.2.3