From 86594324171caf4dc96453ed3a7b56444e48b6d1 Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Thu, 18 Oct 2012 23:23:05 -0700
Subject: Update tests to match current code.

---
 spec/unit/puppet/provider/vcsrepo/cvs_spec.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
index 7c26952..c16c7ea 100644
--- a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
@@ -6,10 +6,9 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
     context "with a source", :resource => {:source => ':ext:source@example.com:/foo/bar'} do
       resource_with :revision do
         it "should execute 'cvs checkout' and 'cvs update -r'" do
-          expects_chdir
+          provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-r', 'an-unimportant-value', '-d', 'vcsrepo', 'bar')
           expects_chdir(File.dirname(resource.value(:path)))
-          provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
-          provider.expects(:cvs).with('update', '-r', resource.value(:revision), '.')
+          #provider.expects(:cvs).with('update', '-r', resource.value(:revision), '.')
           provider.create
         end        
       end
@@ -67,7 +66,7 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
     
     context "when CVS/Tag exists" do
       before do
-        @tag = 'HEAD'
+        @tag = 'TAG'
         File.expects(:exist?).with(@tag_file).returns(true)
       end
       it "should read CVS/Tag" do
@@ -80,8 +79,8 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
       before do
         File.expects(:exist?).with(@tag_file).returns(false)
       end
-      it "assumes MAIN" do
-        provider.revision.should == 'MAIN'        
+      it "assumes HEAD" do
+        provider.revision.should == 'HEAD'
       end
     end
   end
@@ -91,9 +90,9 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
       @tag = 'SOMETAG'
     end
     
-    it "should use 'cvs update -r'" do
+    it "should use 'cvs update -dr'" do
       expects_chdir
-      provider.expects('cvs').with('update', '-r', @tag, '.')
+      provider.expects('cvs').with('update', '-dr', @tag, '.')
       provider.revision = @tag
     end
   end
-- 
cgit v1.2.3