summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2013-07-17 14:25:51 -0700
committerAaron Stone <aaron@serendipity.cx>2013-07-17 14:25:51 -0700
commitff2607235cd29114212bd49186319a7bf0980944 (patch)
tree3932da0e02fd12956825a1f5796e83aa4bc43d87 /spec
parent76227ed83795b882e0d8cffcff79ea5bab61ab6c (diff)
parentad6913b81db57f29ab634d353963b66ffb2a814d (diff)
Merge pull request #46 from Paulche/master
Enable unlimited nesting for submodule updating
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/puppet/provider/vcsrepo/git_spec.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
index e10fd1e..68b6c0a 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
@@ -218,11 +218,8 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
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.expects(:git).with('submodule', 'update', '--init', '--recursive')
provider.revision = resource.value(:revision)
end
end