From f373a8b78935b0ee1005df0ead235d76a79178c5 Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Thu, 18 Oct 2012 22:01:46 -0700
Subject: Get the specs running under bundler.

---
 spec/unit/puppet/provider/vcsrepo/hg_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/unit/puppet/provider/vcsrepo/hg_spec.rb')

diff --git a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
index 6f32d44..318ddb0 100644
--- a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
@@ -1,4 +1,4 @@
-require 'pathname'; Pathname.new(__FILE__).realpath.ascend { |x| begin; require (x + 'spec_helper.rb'); break; rescue LoadError; end }
+require 'spec_helper'
 
 describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
 
-- 
cgit v1.2.3


From 5402f4f1dd4b315f14afa671e3c2c236ac9f53ce Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Thu, 18 Oct 2012 23:31:29 -0700
Subject: Remove excess whitespace.

---
 spec/unit/puppet/provider/vcsrepo/hg_spec.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'spec/unit/puppet/provider/vcsrepo/hg_spec.rb')

diff --git a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
index 318ddb0..948bfe0 100644
--- a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
@@ -11,17 +11,17 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
                                       resource.value(:source),
                                       resource.value(:path))
           provider.create
-        end        
+        end
       end
-      
+
       resource_without :revision do
         it "should just execute 'hg clone' without a revision" do
           provider.expects(:hg).with('clone', resource.value(:source), resource.value(:path))
           provider.create
-        end        
+        end
       end
     end
-    
+
     context "when a source is not given" do
       it "should execute 'hg init'" do
         provider.expects(:hg).with('init', resource.value(:path))
@@ -48,37 +48,37 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
     before do
       expects_chdir
     end
-    
+
     context "when given a non-SHA as the resource revision" do
       before do
         provider.expects(:hg).with('parents').returns(fixture(:hg_parents))
         provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
       end
-      
+
       context "when its SHA is not different than the current SHA", :resource => {:revision => '0.6'} do
         it "should return the ref" do
           provider.revision.should == '0.6'
         end
       end
-      
+
       context "when its SHA is different than the current SHA", :resource => {:revision => '0.5.3'} do
         it "should return the current SHA" do
           provider.revision.should == '34e6012c783a'
-        end          
+        end
       end
     end
     context "when given a SHA as the resource revision" do
       before do
         provider.expects(:hg).with('parents').returns(fixture(:hg_parents))
       end
-      
+
       context "when it is the same as the current SHA", :resource => {:revision => '34e6012c783a'} do
         it "should return it" do
           provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
           provider.revision.should == resource.value(:revision)
         end
       end
-      
+
       context "when it is not the same as the current SHA", :resource => {:revision => 'not-the-same'} do
         it "should return the current SHA" do
           provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
@@ -87,7 +87,7 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
       end
     end
   end
-  
+
   describe "setting the revision property" do
     before do
       @revision = '6aa99e9b3ab1'
-- 
cgit v1.2.3


From 821c66fe76056784f84376e5beb4d2de629998ed Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Fri, 19 Oct 2012 00:26:39 -0700
Subject: Use symbols consistently with provider.expects()

---
 spec/unit/puppet/provider/vcsrepo/hg_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spec/unit/puppet/provider/vcsrepo/hg_spec.rb')

diff --git a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
index 948bfe0..f17aa2f 100644
--- a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
@@ -94,9 +94,9 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
     end
     it "should use 'hg update ---clean -r'" do
       expects_chdir
-      provider.expects('hg').with('pull')
-      provider.expects('hg').with('merge')
-      provider.expects('hg').with('update', '--clean', '-r', @revision)
+      provider.expects(:hg).with('pull')
+      provider.expects(:hg).with('merge')
+      provider.expects(:hg).with('update', '--clean', '-r', @revision)
       provider.revision = @revision
     end
   end
-- 
cgit v1.2.3