1 files changed, 50 insertions, 31 deletions
diff --git a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
index c0231e9..b5e2f73 100644
--- a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
@@ -1,24 +1,41 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:bzr_provider) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :bzr,
+    :revision => '2634',
+    :source   => 'lp:do',
+    :path     => '/tmp/test',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('bzr').returns('/usr/bin/bzr')
+  end
 
   describe 'creating' do
-    resource_with :source do
-      resource_with :revision do
-        it "should execute 'bzr clone -r' with the revision" do
-          provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
-          provider.create
-        end
+    context 'with defaults' do
+      it "should execute 'bzr clone -r' with the revision" do
+        provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
+        provider.create
       end
-      resource_without :revision do
-        it "should just execute 'bzr clone' without a revision" do
-          provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
-          provider.create
-        end
+    end
+
+    context 'without revision' do
+      it "should just execute 'bzr clone' without a revision" do
+        resource.delete(:revision)
+        provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
+        provider.create
       end
     end
-    resource_without :source do
+
+    context 'without source' do
       it "should execute 'bzr init'" do
+        resource.delete(:source)
         provider.expects(:bzr).with('init', resource.value(:path))
         provider.create
       end
@@ -27,14 +44,13 @@ describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
 
   describe 'destroying' do
     it "it should remove the directory" do
-      expects_rm_rf
       provider.destroy
     end
   end
 
   describe "checking existence" do
     it "should check for the directory" do
-      expects_directory?(true, File.join(resource.value(:path), '.bzr'))
+      File.expects(:directory?).with(File.join(resource.value(:path), '.bzr')).returns(true)
       provider.exists?
     end
   end
@@ -42,46 +58,49 @@ describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
   describe "checking the revision property" do
     before do
       expects_chdir
-      provider.expects(:bzr).with('version-info').returns(fixture(:bzr_version_info))
+      provider.expects(:bzr).with('version-info').returns(File.read(fixtures('bzr_version_info.txt')))
       @current_revid = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
     end
-    context "when given a non-revid as the resource revision", :resource => {:revision => '2634'} do
+
+    context "when given a non-revid as the resource revision" do
       context "when its revid is not different than the current revid" do
-        before do
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("#{resource.value(:revision)} menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
-        end
         it "should return the ref" do
-          provider.revision.should == resource.value(:revision)
+          resource[:revision] = '2634'
+          provider.expects(:bzr).with('revision-info', '2634').returns("2634 menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
+          expect(provider.revision).to eq(resource.value(:revision))
         end
       end
-      context "when its revid is different than the current revid", :resource => {:revision => '2636'} do
+      context "when its revid is different than the current revid" do
         it "should return the current revid" do
+          resource[:revision] = '2636'
           provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2635 foo\n")
-          provider.revision.should == @current_revid
+          expect(provider.revision).to eq(@current_revid)
         end
       end
     end
+
     context "when given a revid as the resource revision" do
-      context "when it is the same as the current revid", :resource => {:revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'} do
-        before do
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
-        end
+      context "when it is the same as the current revid" do
         it "should return it" do
-          provider.revision.should == resource.value(:revision)
+          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
+          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
+          expect(provider.revision).to eq(resource.value(:revision))
         end
       end
-      context "when it is not the same as the current revid", :resource => {:revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'} do
+      context "when it is not the same as the current revid" do
         it "should return the current revid" do
+          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'
           provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2636 foo\n")
-          provider.revision.should == @current_revid
+          expect(provider.revision).to eq(@current_revid)
         end
       end
+
     end
   end
 
   describe "setting the revision property" do
     it "should use 'bzr update -r' with the revision" do
-      expects_chdir
+      Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
       provider.expects(:bzr).with('update', '-r', 'somerev')
       provider.revision = 'somerev'
     end