summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock20
-rw-r--r--README.GIT.markdown2
-rw-r--r--lib/puppet/provider/vcsrepo/bzr.rb1
-rw-r--r--lib/puppet/provider/vcsrepo/cvs.rb1
-rw-r--r--lib/puppet/provider/vcsrepo/dummy.rb12
-rw-r--r--lib/puppet/provider/vcsrepo/git.rb1
-rw-r--r--lib/puppet/provider/vcsrepo/hg.rb1
-rw-r--r--lib/puppet/provider/vcsrepo/svn.rb1
-rw-r--r--lib/puppet/type/vcsrepo.rb1
-rw-r--r--spec/spec_helper.rb1
-rw-r--r--spec/support/fixture_helpers.rb1
-rw-r--r--spec/unit/puppet/provider/vcsrepo/bzr_spec.rb4
-rw-r--r--spec/unit/puppet/provider/vcsrepo/cvs_spec.rb17
-rw-r--r--spec/unit/puppet/provider/vcsrepo/dummy_spec.rb17
-rw-r--r--spec/unit/puppet/provider/vcsrepo/git_spec.rb87
-rw-r--r--spec/unit/puppet/provider/vcsrepo/hg_spec.rb8
-rw-r--r--spec/unit/puppet/provider/vcsrepo/svn_spec.rb12
18 files changed, 124 insertions, 68 deletions
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..cde1d14
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,5 @@
+source :rubygems
+gem 'rake', '~> 0.8.7'
+gem 'rspec', '~> 1.2.9'
+gem 'mocha', '~> 0.12.7', :require => false
+gem 'puppet', '~> 2.7'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..210a2dd
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,20 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ facter (1.6.13)
+ metaclass (0.0.1)
+ mocha (0.12.7)
+ metaclass (~> 0.0.1)
+ puppet (2.7.19)
+ facter (~> 1.5)
+ rake (0.8.7)
+ rspec (1.2.9)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ mocha (~> 0.12.7)
+ puppet (~> 2.7)
+ rake (~> 0.8.7)
+ rspec (~> 1.2.9)
diff --git a/README.GIT.markdown b/README.GIT.markdown
index 88747c6..d6b8afe 100644
--- a/README.GIT.markdown
+++ b/README.GIT.markdown
@@ -53,7 +53,7 @@ For a specific revision or branch (can be a commit SHA, tag or branch name):
source => 'git://example.com/repo.git',
revision => 'development'
}
-
+
Check out as a user:
vcsrepo { "/path/to/repo":
diff --git a/lib/puppet/provider/vcsrepo/bzr.rb b/lib/puppet/provider/vcsrepo/bzr.rb
index f9d58e2..6169929 100644
--- a/lib/puppet/provider/vcsrepo/bzr.rb
+++ b/lib/puppet/provider/vcsrepo/bzr.rb
@@ -4,7 +4,6 @@ Puppet::Type.type(:vcsrepo).provide(:bzr, :parent => Puppet::Provider::Vcsrepo)
desc "Supports Bazaar repositories"
optional_commands :bzr => 'bzr'
- defaultfor :bzr => :exists
has_features :reference_tracking
def create
diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb
index 5cdcfb8..6dc7882 100644
--- a/lib/puppet/provider/vcsrepo/cvs.rb
+++ b/lib/puppet/provider/vcsrepo/cvs.rb
@@ -4,7 +4,6 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo)
desc "Supports CVS repositories/workspaces"
optional_commands :cvs => 'cvs'
- defaultfor :cvs => :exists
has_features :gzip_compression, :reference_tracking, :modules
def create
diff --git a/lib/puppet/provider/vcsrepo/dummy.rb b/lib/puppet/provider/vcsrepo/dummy.rb
new file mode 100644
index 0000000..f7b4e54
--- /dev/null
+++ b/lib/puppet/provider/vcsrepo/dummy.rb
@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
+
+Puppet::Type.type(:vcsrepo).provide(:dummy, :parent => Puppet::Provider::Vcsrepo) do
+ desc "Dummy default provider"
+
+ defaultfor :vcsrepo => :dummy
+
+ def working_copy_exists?
+ providers = @resource.class.providers.map{|x| x.to_s}.sort.reject{|x| x == "dummy"}.join(", ") rescue "none"
+ raise("vcsrepo resource must have a provider, available: #{providers}")
+ end
+end
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 95115c6..9254243 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -6,7 +6,6 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
##TODO modify the commands below so that the su - is included
optional_commands :git => 'git',
:su => 'su'
- defaultfor :git => :exists
has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user
def create
diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb
index 0be5e08..67a2a82 100644
--- a/lib/puppet/provider/vcsrepo/hg.rb
+++ b/lib/puppet/provider/vcsrepo/hg.rb
@@ -4,7 +4,6 @@ Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) d
desc "Supports Mercurial repositories"
optional_commands :hg => 'hg'
- defaultfor :hg => :exists
has_features :reference_tracking
def create
diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb
index 85c5089..b2a8880 100644
--- a/lib/puppet/provider/vcsrepo/svn.rb
+++ b/lib/puppet/provider/vcsrepo/svn.rb
@@ -6,7 +6,6 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo)
optional_commands :svn => 'svn',
:svnadmin => 'svnadmin'
- defaultfor :svn => :exists
has_features :filesystem_types, :reference_tracking, :basic_auth
def create
diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb
index 1fd006b..4b53235 100644
--- a/lib/puppet/type/vcsrepo.rb
+++ b/lib/puppet/type/vcsrepo.rb
@@ -135,7 +135,6 @@ Puppet::Type.newtype(:vcsrepo) do
newparam :user do
desc "The user to run for repository operations"
- defaultto 'root'
end
newparam :excludes do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 95e5d6e..3bac650 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,7 @@ require 'pathname'
dir = Pathname.new(__FILE__).parent
$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
+require 'test/unit'
require 'mocha'
require 'puppet'
gem 'rspec', '>= 1.2.9'
diff --git a/spec/support/fixture_helpers.rb b/spec/support/fixture_helpers.rb
index 205715c..8a0e0a0 100644
--- a/spec/support/fixture_helpers.rb
+++ b/spec/support/fixture_helpers.rb
@@ -3,4 +3,5 @@ module FixtureHelpers
def fixture(name, ext = '.txt')
File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', name.to_s + ext))
end
+
end
diff --git a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
index 6c66ef4..e1804de 100644
--- a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/bzr_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, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
@@ -82,7 +82,7 @@ describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
describe "setting the revision property" do
it "should use 'bzr update -r' with the revision" do
revision = 'somerev'
- provider.expects('bzr').with('update', '-r', revision, resource.value(:path))
+ provider.expects(:bzr).with('update', '-r', revision, resource.value(:path))
provider.revision = revision
end
end
diff --git a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
index 9bae8ae..aad54cc 100644
--- a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/cvs_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, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
@@ -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
diff --git a/spec/unit/puppet/provider/vcsrepo/dummy_spec.rb b/spec/unit/puppet/provider/vcsrepo/dummy_spec.rb
new file mode 100644
index 0000000..a945888
--- /dev/null
+++ b/spec/unit/puppet/provider/vcsrepo/dummy_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe_provider :vcsrepo, :dummy, :resource => {:path => '/tmp/vcsrepo'} do
+
+ context 'dummy' do
+ resource_with :source do
+ resource_with :ensure => :present do
+ context "with nothing doing", :resource => {:revision => 'foo'} do
+ it "should raise an exception" do
+ proc { provider.working_copy_exists? }.should raise_error(RuntimeError)
+ end
+ end
+ end
+ end
+ end
+
+end
diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
index 4a1085a..83dbff2 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_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, :git, :resource => {:path => '/tmp/vcsrepo'} do
@@ -7,24 +7,24 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} 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))
+ provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
expects_chdir
- provider.expects(:remote_revision_branch?).returns(true)
- provider.expects(:git).with('checkout', '-b', resource.value(:revision), '--track', "origin/#{resource.value(:revision)}")
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))
+ provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
expects_chdir
- provider.expects(:remote_revision_branch?).returns(false)
- provider.expects('git').with('reset', '--hard', resource.value(:revision))
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
+ 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))
@@ -33,7 +33,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
end
end
end
-
+
resource_with :ensure => :bare do
resource_with :revision do
it "should just execute 'git clone --bare'" do
@@ -41,7 +41,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
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))
@@ -50,7 +50,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
end
end
end
-
+
context "when a source is not given" do
resource_with :ensure => :present do
context "when the path does not exist" do
@@ -63,7 +63,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
provider.create
end
end
-
+
context "when the path is a bare repository" do
it "should convert it to a working copy" do
provider.expects(:bare_exists?).returns(true)
@@ -71,16 +71,15 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
provider.create
end
end
-
+
context "when the path is not a repository" do
it "should raise an exception" do
- expects_directory?(true)
- provider.expects(:bare_exists?).returns(false)
+ provider.expects(:path_exists?).returns(true)
proc { provider.create }.should raise_error(Puppet::Error)
end
end
end
-
+
resource_with :ensure => :bare do
context "when the path does not exist" do
it "should execute 'git init --bare'" do
@@ -92,7 +91,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
provider.create
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)
@@ -100,11 +99,10 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
provider.create
end
end
-
+
context "when the path is not a repository" do
it "should raise an exception" do
expects_directory?(true)
- provider.expects(:working_copy_exists?).returns(false)
proc { provider.create }.should raise_error(Puppet::Error)
end
end
@@ -112,77 +110,86 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
end
end
-
+
context 'destroying' do
it "it should remove the directory" do
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
-
+
context "when its SHA is not different than the current SHA" do
it "should return the ref" do
+ provider.expects(:git).with('fetch', 'origin') # FIXME
+ provider.expects(:git).with('fetch', '--tags', 'origin')
provider.expects(:git).with('rev-parse', 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('fetch', 'origin') # FIXME
+ provider.expects(:git).with('fetch', '--tags', 'origin')
provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('othersha')
+ provider.expects(:git).with('tag', '-l').returns("Hello")
provider.revision.should == 'currentsha'
end
end
end
end
-
+
context "setting the revision property" do
before do
expects_chdir
- provider.expects(:git).with('fetch', 'origin')
end
context "when it's an existing local branch", :resource => {:revision => 'feature/foo'} do
it "should use 'git fetch' and 'git reset'" do
- provider.expects(:local_revision_branch?).returns(true)
- provider.expects(:git).with('checkout', resource.value(:revision))
- provider.expects(:git).with('pull', 'origin')
provider.expects(:update_submodules)
+ provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
+ provider.expects(:git).with('checkout', '--force', resource.value(:revision))
+ provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
+ provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}")
provider.revision = resource.value(:revision)
end
end
context "when it's a remote branch", :resource => {:revision => 'only/remote'} do
it "should use 'git fetch' and 'git reset'" do
- provider.expects(:local_revision_branch?).returns(false)
- provider.expects(:remote_revision_branch?).returns(true)
- provider.expects(:git).with('checkout',
- '-b', resource.value(:revision),
- '--track', "origin/#{resource.value(:revision)}")
provider.expects(:update_submodules)
+ provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
+ provider.expects(:git).with('checkout', '--force', resource.value(:revision))
+ provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
+ provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}")
provider.revision = resource.value(:revision)
end
end
context "when it's a commit or tag", :resource => {:revision => 'a-commit-or-tag'} do
it "should use 'git fetch' and 'git reset'" do
- provider.expects(:local_revision_branch?).returns(false)
- provider.expects(:remote_revision_branch?).returns(false)
- provider.expects(:git).with('reset', '--hard', resource.value(:revision))
+ 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))
provider.expects(:git).with('submodule', 'init')
provider.expects(:git).with('submodule', 'update')
+ provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
+ provider.expects(:git).with('submodule', 'foreach', 'git', 'submodule', 'init')
+ provider.expects(:git).with('submodule', 'foreach', 'git', 'submodule', 'update')
provider.revision = resource.value(:revision)
end
- end
+ end
end
-
+
context "updating references" do
it "should use 'git fetch --tags'" do
expects_chdir
+ provider.expects(:git).with('fetch', 'origin')
provider.expects(:git).with('fetch', '--tags', 'origin')
provider.update_references
end
@@ -216,7 +223,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
provider.should_not be_remote_branch_revision
end
end
- end
+ end
end
-
+
end
diff --git a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
index e1287cf..f17aa2f 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
@@ -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
diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
index 5587d4c..75d58f9 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
@@ -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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 10:45:30 +0000