summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2012-10-19 00:26:39 -0700
committerAaron Stone <aaron@serendipity.cx>2012-10-19 00:27:46 -0700
commit821c66fe76056784f84376e5beb4d2de629998ed (patch)
tree453cc95abbd37aa7b31464f98ab9059af8caed8c
parent5402f4f1dd4b315f14afa671e3c2c236ac9f53ce (diff)
Use symbols consistently with provider.expects()
-rw-r--r--spec/unit/puppet/provider/vcsrepo/bzr_spec.rb2
-rw-r--r--spec/unit/puppet/provider/vcsrepo/cvs_spec.rb2
-rw-r--r--spec/unit/puppet/provider/vcsrepo/git_spec.rb4
-rw-r--r--spec/unit/puppet/provider/vcsrepo/hg_spec.rb6
-rw-r--r--spec/unit/puppet/provider/vcsrepo/svn_spec.rb4
5 files changed, 9 insertions, 9 deletions
diff --git a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
index cccbaa6..e1804de 100644
--- a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
@@ -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 4c15757..aad54cc 100644
--- a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
@@ -92,7 +92,7 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
it "should use 'cvs update -dr'" do
expects_chdir
- provider.expects('cvs').with('update', '-dr', @tag, '.')
+ provider.expects(:cvs).with('update', '-dr', @tag, '.')
provider.revision = @tag
end
end
diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
index 7d5d327..83dbff2 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
@@ -7,7 +7,7 @@ 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(:update_submodules)
provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
@@ -17,7 +17,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
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(:update_submodules)
provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
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
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