From f373a8b78935b0ee1005df0ead235d76a79178c5 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 18 Oct 2012 22:01:46 -0700 Subject: Get the specs running under bundler. --- spec/unit/puppet/provider/vcsrepo/svn_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/unit/puppet/provider/vcsrepo/svn_spec.rb') diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb index db4a4c7..042554c 100644 --- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/svn_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, :svn, :resource => {:path => '/tmp/vcsrepo'} do -- cgit v1.2.3 From 86594324171caf4dc96453ed3a7b56444e48b6d1 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 18 Oct 2012 23:23:05 -0700 Subject: Update tests to match current code. --- spec/unit/puppet/provider/vcsrepo/svn_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/unit/puppet/provider/vcsrepo/svn_spec.rb') diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb index 042554c..5c27818 100644 --- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb @@ -6,7 +6,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do resource_with :source do resource_with :revision do it "should execute 'svn checkout' with a revision" do - provider.expects(:svn).with('checkout', '-r', + provider.expects(:svn).with('--non-interactive', 'checkout', '-r', resource.value(:revision), resource.value(:source), resource.value(:path)) @@ -15,7 +15,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do end resource_without :revision do it "should just execute 'svn checkout' without a revision" do - provider.expects(:svn).with('checkout', + provider.expects(:svn).with('--non-interactive', 'checkout', resource.value(:source), resource.value(:path)) provider.create @@ -56,11 +56,11 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do describe "checking the revision property" do before do - provider.expects('svn').with('info').returns(fixture(:svn_info)) + provider.expects('svn').with('--non-interactive', 'info').returns(fixture(:svn_info)) end it "should use 'svn info'" do expects_chdir - provider.revision.should == '4' + provider.revision.should == '3' # From 'Last Changed Rev', not 'Revision' end end @@ -70,7 +70,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do end it "should use 'svn update'" do expects_chdir - provider.expects('svn').with('update', '-r', @revision) + provider.expects('svn').with('--non-interactive', 'update', '-r', @revision) provider.revision = @revision end end -- cgit v1.2.3 From 5402f4f1dd4b315f14afa671e3c2c236ac9f53ce Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 18 Oct 2012 23:31:29 -0700 Subject: Remove excess whitespace. --- spec/unit/puppet/provider/vcsrepo/svn_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/unit/puppet/provider/vcsrepo/svn_spec.rb') diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb index 5c27818..d360433 100644 --- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb @@ -11,7 +11,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do resource.value(:source), resource.value(:path)) provider.create - end + end end resource_without :revision do it "should just execute 'svn checkout' without a revision" do @@ -19,7 +19,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do resource.value(:source), resource.value(:path)) provider.create - end + end end end resource_without :source do @@ -63,7 +63,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do provider.revision.should == '3' # From 'Last Changed Rev', not 'Revision' end end - + describe "setting the revision property" do before do @revision = '30' -- cgit v1.2.3 From 821c66fe76056784f84376e5beb4d2de629998ed Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 19 Oct 2012 00:26:39 -0700 Subject: Use symbols consistently with provider.expects() --- spec/unit/puppet/provider/vcsrepo/svn_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/unit/puppet/provider/vcsrepo/svn_spec.rb') diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb index d360433..75d58f9 100644 --- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb @@ -56,7 +56,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do describe "checking the revision property" do before do - provider.expects('svn').with('--non-interactive', 'info').returns(fixture(:svn_info)) + provider.expects(:svn).with('--non-interactive', 'info').returns(fixture(:svn_info)) end it "should use 'svn info'" do expects_chdir @@ -70,7 +70,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do end it "should use 'svn update'" do expects_chdir - provider.expects('svn').with('--non-interactive', 'update', '-r', @revision) + provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision) provider.revision = @revision end end -- cgit v1.2.3