Overhaul the spec tests to work in rspec2.

This work gets rid of the provider_example_group and reworks everything
to work properly against rspec2.  I don't know if I'd consider the style
"better" but it works.

1 files changed, 182 insertions, 154 deletions

diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
index 1a6d008..d2769ae 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
@@ -1,192 +1,212 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:git_provider) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :git,
+    :revision => '2634',
+    :source   => 'git@repo',
+    :path     => '/tmp/test',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
+  end
 
   context 'creating' do
-    resource_with :source do
-      resource_with :ensure => :present do
-        context "with a revision that is a remote branch", :resource => {:revision => 'only/remote'} do
-          it "should execute 'git clone' and 'git checkout -b'" do
-            provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-            expects_chdir('/')
-            expects_chdir
-            provider.expects(:update_submodules)
-            provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-            provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-            provider.create
-          end
-        end
-        context "with a revision that is not a remote branch", :resource => {:revision => 'a-commit-or-tag'} do
-          it "should execute 'git clone' and 'git reset --hard'" do
-            provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-            expects_chdir('/')
-            expects_chdir
-            provider.expects(:update_submodules)
-            provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-            provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-            provider.create
-          end
-        end
-        resource_without :revision do
-          it "should execute 'git clone' and submodule commands" do
-            provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-            provider.expects(:update_submodules)
-            provider.create
-          end
-        end
+    context "with a revision that is a remote branch" do
+      it "should execute 'git clone' and 'git checkout -b'" do
+        resource[:revision] = 'only/remote'
+        Dir.expects(:chdir).with('/').at_least_once.yields
+        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
+        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
+        provider.expects(:update_submodules)
+        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
+        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
+        provider.create
       end
+    end
 
-      resource_with :ensure => :bare do
-        resource_with :revision do
-          it "should just execute 'git clone --bare'" do
-            provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-            provider.create
-          end
-        end
+    context "with a revision that is not a remote branch" do
+      it "should execute 'git clone' and 'git reset --hard'" do
+        resource[:revision] = 'a-commit-or-tag'
+        Dir.expects(:chdir).with('/').at_least_once.yields
+        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
+        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
+        provider.expects(:update_submodules)
+        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
+        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
+        provider.create
+      end
+
+      it "should execute 'git clone' and submodule commands" do
+        resource.delete(:revision)
+        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
+        provider.expects(:update_submodules)
+        provider.create
+      end
+    end
 
-        resource_without :revision do
-          it "should just execute 'git clone --bare'" do
-            provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-            provider.create
-          end
+    context "with an ensure of bare" do
+      context "with revision" do
+        it "should just execute 'git clone --bare'" do
+          resource[:ensure] = :bare
+          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
+          provider.create
+        end
+      end
+      context "without revision" do
+        it "should just execute 'git clone --bare'" do
+          resource[:ensure] = :bare
+          resource.delete(:revision)
+          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
+          provider.create
         end
       end
     end
 
     context "when a source is not given" do
-      resource_with :ensure => :present do
-        context "when the path does not exist" do
-          it "should execute 'git init'" do
-            expects_mkdir
-            expects_chdir
-            expects_directory?(false)
-            provider.expects(:bare_exists?).returns(false)
-            provider.expects(:git).with('init')
-            provider.create
-          end
-        end
+      context "when the path does not exist" do
+        it "should execute 'git init'" do
+          resource[:ensure] = :present
+          resource.delete(:source)
+          expects_mkdir
+          expects_chdir
+          expects_directory?(false)
 
-        context "when the path is a bare repository" do
-          it "should convert it to a working copy" do
-            provider.expects(:bare_exists?).returns(true)
-            provider.expects(:convert_bare_to_working_copy)
-            provider.create
-          end
+          provider.expects(:bare_exists?).returns(false)
+          provider.expects(:git).with('init')
+          provider.create
         end
+      end
 
-        context "when the path is not empty and not a repository" do
-          it "should raise an exception" do
-            provider.expects(:path_exists?).returns(true)
-            provider.expects(:path_empty?).returns(false)
-            proc { provider.create }.should raise_error(Puppet::Error)
-          end
+      context "when the path is a bare repository" do
+        it "should convert it to a working copy" do
+          resource[:ensure] = :present
+          resource.delete(:source)
+          provider.expects(:bare_exists?).returns(true)
+          provider.expects(:convert_bare_to_working_copy)
+          provider.create
         end
       end
 
-      resource_with :ensure => :bare do
-        context "when the path does not exist" do
-          it "should execute 'git init --bare'" do
-            expects_chdir
-            expects_mkdir
-            expects_directory?(false)
-            provider.expects(:working_copy_exists?).returns(false)
-            provider.expects(:git).with('init', '--bare')
-            provider.create
-          end
+      context "when the path is not empty and not a repository" do
+        it "should raise an exception" do
+          provider.expects(:path_exists?).returns(true)
+          provider.expects(:path_empty?).returns(false)
+          proc { provider.create }.should raise_error(Puppet::Error)
         end
+      end
+    end
 
-        context "when the path is a working copy repository" do
-          it "should convert it to a bare repository" do
-            provider.expects(:working_copy_exists?).returns(true)
-            provider.expects(:convert_working_copy_to_bare)
-            provider.create
-          end
-        end
+    context "when the path does not exist" do
+      it "should execute 'git init --bare'" do
+        resource[:ensure] = :bare
+        resource.delete(:source)
+        expects_chdir
+        expects_mkdir
+        expects_directory?(false)
+        provider.expects(:working_copy_exists?).returns(false)
+        provider.expects(:git).with('init', '--bare')
+        provider.create
+      end
+    end
 
-        context "when the path is not empty and not a repository" do
-          it "should raise an exception" do
-            expects_directory?(true)
-            provider.expects(:path_empty?).returns(false)
-            proc { provider.create }.should raise_error(Puppet::Error)
-          end
-        end
+    context "when the path is a working copy repository" do
+      it "should convert it to a bare repository" do
+        resource[:ensure] = :bare
+        resource.delete(:source)
+        provider.expects(:working_copy_exists?).returns(true)
+        provider.expects(:convert_working_copy_to_bare)
+        provider.create
       end
     end
 
+    context "when the path is not empty and not a repository" do
+      it "should raise an exception" do
+        expects_directory?(true)
+        provider.expects(:path_empty?).returns(false)
+        proc { provider.create }.should raise_error(Puppet::Error)
+      end
+    end
   end
 
+
   context 'destroying' do
     it "it should remove the directory" do
-      expects_rm_rf
+      #expects_rm_rf
       provider.destroy
     end
   end
 
   context "checking the revision property" do
-    resource_with :revision do
-      before do
-        expects_chdir
-        provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-      end
+    before do
+      expects_chdir('/tmp/test')
+      resource[:revision] = 'currentsha'
+      resource.delete(:source)
+      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('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.revision.should == resource.value(:revision)
-        end
+    context "when its SHA is not different than the current SHA" do
+      it "should return the ref" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.revision.should == resource.value(:revision)
       end
+    end
 
-      context "when its SHA is different than the current SHA" do
-        it "should return the current SHA" do
-          provider.expects(:git).with('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.revision.should == 'currentsha'
-        end
+    context "when its SHA is different than the current SHA" do
+      it "should return the current SHA" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.revision.should == 'currentsha'
       end
+    end
 
-      context "when its a ref to a remote head" do
-        it "should return the revision" do
-          provider.expects(:git).with('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-          provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}")
-          provider.revision.should == 'currentsha'
-        end
+    context "when its a ref to a remote head" do
+      it "should return the revision" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
+        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}")
+        provider.revision.should == 'currentsha'
       end
+    end
 
-      context "when its a ref to non existant remote head" do
-        it "should fail" do
-          provider.expects(:git).with('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-          provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('')
-          expect { provider.revision }.should raise_error(Puppet::Error, /not a local or remote ref$/)
-        end
+    context "when its a ref to non existant remote head" do
+      it "should fail" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
+        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('')
+        expect { provider.revision }.to raise_error(Puppet::Error, /not a local or remote ref$/)
       end
+    end
 
-      context "when the source is modified" do
-        resource_with :source => 'git://git@foo.com/bar.git' do
-          it "should update the origin url" do
-            provider.expects(:git).with('config', 'remote.origin.url').returns('old')
-            provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git')
-            provider.expects(:git).with('fetch', 'origin') # FIXME
-            provider.expects(:git).with('fetch', '--tags', 'origin')
-            provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-            provider.expects(:git).with('tag', '-l').returns("Hello")
-            provider.revision.should == resource.value(:revision)
-          end
-        end
+    context "when the source is modified" do
+      it "should update the origin url" do
+        resource[:source] = 'git://git@foo.com/bar.git'
+        provider.expects(:git).with('config', 'remote.origin.url').returns('old')
+        provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.revision.should == resource.value(:revision)
       end
     end
   end
@@ -195,8 +215,9 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
     before do
       expects_chdir
     end
-    context "when it's an existing local branch", :resource => {:revision => 'feature/foo'} do
+    context "when it's an existing local branch" do
       it "should use 'git fetch' and 'git reset'" do
+        resource[:revision] = 'feature/foo'
         provider.expects(:update_submodules)
         provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
         provider.expects(:git).with('checkout', '--force', resource.value(:revision))
@@ -205,8 +226,9 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
         provider.revision = resource.value(:revision)
       end
     end
-    context "when it's a remote branch", :resource => {:revision => 'only/remote'} do
+    context "when it's a remote branch" do
       it "should use 'git fetch' and 'git reset'" do
+        resource[:revision] = 'only/remote'
         provider.expects(:update_submodules)
         provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
         provider.expects(:git).with('checkout', '--force', resource.value(:revision))
@@ -215,8 +237,9 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
         provider.revision = resource.value(:revision)
       end
     end
-    context "when it's a commit or tag", :resource => {:revision => 'a-commit-or-tag'} do
+    context "when it's a commit or tag" do
       it "should use 'git fetch' and 'git reset'" do
+        resource[:revision] = 'a-commit-or-tag'
         provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
         provider.expects(:git).with('checkout', '--force', resource.value(:revision))
         provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
@@ -229,6 +252,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
 
   context "updating references" do
     it "should use 'git fetch --tags'" do
+      resource.delete(:source)
       expects_chdir
       provider.expects(:git).with('config', 'remote.origin.url').returns('')
       provider.expects(:git).with('fetch', 'origin')
@@ -243,25 +267,29 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
       provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
     end
     context "is a local branch" do
-      context "when it's listed in 'git branch -a'", :resource => {:revision => 'feature/foo'} do
+      context "when it's listed in 'git branch -a'" do
         it "should return true" do
+          resource[:revision] = 'feature/foo'
           provider.should be_local_branch_revision
         end
       end
-      context "when it's not listed in 'git branch -a'" , :resource => {:revision => 'feature/notexist'}do
+      context "when it's not listed in 'git branch -a'" do
         it "should return false" do
+          resource[:revision] = 'feature/notexist'
           provider.should_not be_local_branch_revision
         end
       end
     end
     context "is a remote branch" do
-      context "when it's listed in 'git branch -a' with an 'origin/' prefix", :resource => {:revision => 'only/remote'} do
+      context "when it's listed in 'git branch -a' with an 'origin/' prefix" do
         it "should return true" do
+          resource[:revision] = 'only/remote'
           provider.should be_remote_branch_revision
         end
       end
-      context "when it's not listed in 'git branch -a' with an 'origin/' prefix" , :resource => {:revision => 'only/local'}do
+      context "when it's not listed in 'git branch -a' with an 'origin/' prefix" do
         it "should return false" do
+          resource[:revision] = 'only/local'
           provider.should_not be_remote_branch_revision
         end
       end