Overhaul the spec tests to work in rspec2.

This work gets rid of the provider_example_group and reworks everything
to work properly against rspec2.  I don't know if I'd consider the style
"better" but it works.

10 files changed, 388 insertions, 401 deletions

diff --git a/Gemfile b/Gemfile
index e6e114d..5def829 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,22 @@
 source 'https://rubygems.org'
-gem 'rake', '~> 0.8.7'
-gem 'rspec', '~> 1.3'
-gem 'mocha', '~> 0.12.9', :require => false
-gem 'puppet', "~> #{ENV['PUPPET_VERSION'] || '2.7.22'}"
+
+group :development, :test do
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'rspec-system',            :require => false
+  gem 'rspec-system-puppet',     :require => false
+  gem 'rspec-system-serverspec', :require => false
+  gem 'serverspec',              :require => false
+  gem 'puppet-lint',             :require => false
+  gem 'pry',                     :require => false
+  gem 'simplecov',               :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+# vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index 3e005ff..cd3d379 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1 @@
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3bac650..acfae0c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,25 +1,13 @@
-require 'pathname'
-dir = Pathname.new(__FILE__).parent
-$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'simplecov'
+require 'support/filesystem_helpers'
+require 'support/fixture_helpers'
 
-require 'test/unit'
-require 'mocha'
-require 'puppet'
-gem 'rspec', '>= 1.2.9'
-require 'spec/autorun'
-
-Dir[File.join(File.dirname(__FILE__), 'support', '*.rb')].each do |support_file|
-  require support_file
-end
-
-Spec::Runner.configure do |config|
-  config.mock_with :mocha
-  config.include(FixtureHelpers)
-  config.include(FilesystemHelpers)
+SimpleCov.start do
+    add_filter "/spec/"
 end
 
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
+RSpec.configure do |c|
+  c.include FilesystemHelpers
+  c.include FixtureHelpers
 end
diff --git a/spec/support/provider_example_group.rb b/spec/support/provider_example_group.rb
deleted file mode 100644
index 1431f78..0000000
--- a/spec/support/provider_example_group.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-class ProviderExampleGroup < Spec::Example::ExampleGroup
-
-  # Allow access to the current resource
-  attr_reader :resource
-
-  # Build up the values for the resource in this scope
-  before :each do
-    resource_hash = example_group_hierarchy.inject({}) do |memo, klass|
-      memo.merge(klass.options[:resource] || {})
-    end
-    full_hash = resource_hash.merge(:provider => described_class.name)
-    @resource = described_class.resource_type.new(full_hash)
-  end
-
-  # Build the provider
-  subject { described_class.new(@resource) }
-
-  # Allow access to it via +provider+
-  alias :provider :subject
-
-  # Generate a context for a provider operating on a resource with:
-  #
-  # call-seq:
-  #
-  #   # A parameter/property set (when the value isn't important)
-  #   resource_with :source do
-  #     # ...
-  #   end
-  #
-  #   # A parameter/property set to a specific value
-  #   resource_with :source => 'a-specific-value' do
-  #     # ...
-  #   end
-  #
-  # Note: Choose one or the other (mixing will create two separate contexts)
-  #
-  def self.resource_with(*params, &block)
-    params_with_values = params.last.is_a?(Hash) ? params.pop : {}
-    build_value_context(params_with_values, &block)
-    build_existence_context(*params, &block)
-  end
-
-  def self.build_existence_context(*params, &block) #:nodoc:
-    unless params.empty?
-      text = params.join(', ')
-      placeholders = params.inject({}) { |memo, key| memo.merge(key => 'an-unimportant-value') }
-      context("and with a #{text}", {:resource => placeholders}, &block)
-    end
-  end
-
-  def self.build_value_context(params = {}, &block) #:nodoc:
-    unless params.empty?
-      text = params.map { |k, v| "#{k} => #{v.inspect}" }.join(' and with ')
-      context("and with #{text}", {:resource => params}, &block)
-    end
-  end
-
-
-  # Generate a context for a provider operating on a resource without
-  # a given parameter/property.
-  #
-  # call-seq:
-  #
-  #   resource_without :source do
-  #     # ...
-  #   end
-  #
-  def self.resource_without(field, &block)
-    context("and without a #{field}", &block)
-  end
-
-end
-
-Spec::Example::ExampleGroupFactory.register(:provider, ProviderExampleGroup)
-
-# Outside wrapper to lookup a provider and start the spec using ProviderExampleGroup
-def describe_provider(type_name, provider_name, options = {}, &block)
-  provider_class = Puppet::Type.type(type_name).provider(provider_name)
-  describe(provider_class, options.merge(:type => :provider), &block)
-end
diff --git a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
index c0231e9..488ddc0 100644
--- a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
@@ -1,24 +1,41 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:bzr_provider) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :bzr,
+    :revision => '2634',
+    :source   => 'lp:do',
+    :path     => '/tmp/test',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('bzr').returns('/usr/bin/bzr')
+  end
 
   describe 'creating' do
-    resource_with :source do
-      resource_with :revision do
-        it "should execute 'bzr clone -r' with the revision" do
-          provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
-          provider.create
-        end
+    context 'with defaults' do
+      it "should execute 'bzr clone -r' with the revision" do
+        provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
+        provider.create
       end
-      resource_without :revision do
-        it "should just execute 'bzr clone' without a revision" do
-          provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
-          provider.create
-        end
+    end
+
+    context 'without revision' do
+      it "should just execute 'bzr clone' without a revision" do
+        resource.delete(:revision)
+        provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
+        provider.create
       end
     end
-    resource_without :source do
+
+    context 'without source' do
       it "should execute 'bzr init'" do
+        resource.delete(:source)
         provider.expects(:bzr).with('init', resource.value(:path))
         provider.create
       end
@@ -27,14 +44,13 @@ describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
 
   describe 'destroying' do
     it "it should remove the directory" do
-      expects_rm_rf
       provider.destroy
     end
   end
 
   describe "checking existence" do
     it "should check for the directory" do
-      expects_directory?(true, File.join(resource.value(:path), '.bzr'))
+      File.expects(:directory?).with(File.join(resource.value(:path), '.bzr')).returns(true)
       provider.exists?
     end
   end
@@ -42,46 +58,49 @@ describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
   describe "checking the revision property" do
     before do
       expects_chdir
-      provider.expects(:bzr).with('version-info').returns(fixture(:bzr_version_info))
+      provider.expects(:bzr).with('version-info').returns(File.read(fixtures('bzr_version_info.txt')))
       @current_revid = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
     end
-    context "when given a non-revid as the resource revision", :resource => {:revision => '2634'} do
+
+    context "when given a non-revid as the resource revision" do
       context "when its revid is not different than the current revid" do
-        before do
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("#{resource.value(:revision)} menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
-        end
         it "should return the ref" do
+          resource[:revision] = '2634'
+          provider.expects(:bzr).with('revision-info', '2634').returns("2634 menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
           provider.revision.should == resource.value(:revision)
         end
       end
-      context "when its revid is different than the current revid", :resource => {:revision => '2636'} do
+      context "when its revid is different than the current revid" do
         it "should return the current revid" do
+          resource[:revision] = '2636'
           provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2635 foo\n")
           provider.revision.should == @current_revid
         end
       end
     end
+
     context "when given a revid as the resource revision" do
-      context "when it is the same as the current revid", :resource => {:revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'} do
-        before do
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
-        end
+      context "when it is the same as the current revid" do
         it "should return it" do
+          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
+          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
           provider.revision.should == resource.value(:revision)
         end
       end
-      context "when it is not the same as the current revid", :resource => {:revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'} do
+      context "when it is not the same as the current revid" do
         it "should return the current revid" do
+          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'
           provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2636 foo\n")
           provider.revision.should == @current_revid
         end
       end
+
     end
   end
 
   describe "setting the revision property" do
     it "should use 'bzr update -r' with the revision" do
-      expects_chdir
+      Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
       provider.expects(:bzr).with('update', '-r', 'somerev')
       provider.revision = 'somerev'
     end
diff --git a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
index aad54cc..efa4b33 100644
--- a/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
@@ -1,27 +1,44 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:cvs_provider) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :cvs,
+    :revision => '2634',
+    :source   => 'lp:do',
+    :path     => '/tmp/test',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('cvs').returns('/usr/bin/cvs')
+  end
 
   describe 'creating' 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
-          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('update', '-r', resource.value(:revision), '.')
-          provider.create
-        end
+    context "with a source" do
+      it "should execute 'cvs checkout'" do
+        resource[:source] = ':ext:source@example.com:/foo/bar'
+        resource[:revision] = 'an-unimportant-value'
+        expects_chdir('/tmp')
+        provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-r', 'an-unimportant-value', '-d', 'test', 'bar')
+        provider.create
       end
 
-      resource_without :revision do
-        it "should just execute 'cvs checkout' without a revision" do
-          provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
-          provider.create
-        end
+      it "should just execute 'cvs checkout' without a revision" do
+        resource[:source] = ':ext:source@example.com:/foo/bar'
+        resource.delete(:revision)
+        provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
+        provider.create
       end
 
-      context "with a compression", :resource => {:compression => '3'} do
+      context "with a compression" do
         it "should just execute 'cvs checkout' without a revision" do
+          resource[:source] = ':ext:source@example.com:/foo/bar'
+          resource[:compression] = '3'
+          resource.delete(:revision)
           provider.expects(:cvs).with('-d', resource.value(:source), '-z', '3', 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
           provider.create
         end
@@ -30,6 +47,7 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
 
     context "when a source is not given" do
       it "should execute 'cvs init'" do
+        resource.delete(:source)
         provider.expects(:cvs).with('-d', resource.value(:path), 'init')
         provider.create
       end
@@ -38,24 +56,21 @@ describe_provider :vcsrepo, :cvs, :resource => {:path => '/tmp/vcsrepo'} do
 
   describe 'destroying' do
     it "it should remove the directory" do
-      expects_rm_rf
       provider.destroy
     end
   end
 
   describe "checking existence" do
-    resource_with :source do
-      it "should check for the CVS directory" do
-        File.expects(:directory?).with(File.join(resource.value(:path), 'CVS'))
-        provider.exists?
-      end
+    it "should check for the CVS directory with source" do
+      resource[:source] = ':ext:source@example.com:/foo/bar'
+      File.expects(:directory?).with(File.join(resource.value(:path), 'CVS'))
+      provider.exists?
     end
 
-    resource_without :source do
-      it "should check for the CVSROOT directory" do
-        File.expects(:directory?).with(File.join(resource.value(:path), 'CVSROOT'))
-        provider.exists?
-      end
+    it "should check for the CVSROOT directory without source" do
+      resource.delete(:source)
+      File.expects(:directory?).with(File.join(resource.value(:path), 'CVSROOT'))
+      provider.exists?
     end
   end
 
diff --git a/spec/unit/puppet/provider/vcsrepo/dummy_spec.rb b/spec/unit/puppet/provider/vcsrepo/dummy_spec.rb
deleted file mode 100644
index a945888..0000000
--- a/spec/unit/puppet/provider/vcsrepo/dummy_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-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 1a6d008..d2769ae 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
@@ -1,192 +1,212 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:git_provider) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :git,
+    :revision => '2634',
+    :source   => 'git@repo',
+    :path     => '/tmp/test',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
+  end
 
   context 'creating' do
-    resource_with :source 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))
-            expects_chdir('/')
-            expects_chdir
-            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))
-            expects_chdir('/')
-            expects_chdir
-            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
-        resource_without :revision do
-          it "should execute 'git clone' and submodule commands" do
-            provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-            provider.expects(:update_submodules)
-            provider.create
-          end
-        end
+    context "with a revision that is a remote branch" do
+      it "should execute 'git clone' and 'git checkout -b'" do
+        resource[:revision] = 'only/remote'
+        Dir.expects(:chdir).with('/').at_least_once.yields
+        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
+        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
+        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
 
-      resource_with :ensure => :bare do
-        resource_with :revision do
-          it "should just execute 'git clone --bare'" do
-            provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-            provider.create
-          end
-        end
+    context "with a revision that is not a remote branch" do
+      it "should execute 'git clone' and 'git reset --hard'" do
+        resource[:revision] = 'a-commit-or-tag'
+        Dir.expects(:chdir).with('/').at_least_once.yields
+        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
+        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
+        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
+
+      it "should execute 'git clone' and submodule commands" do
+        resource.delete(:revision)
+        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
+        provider.expects(:update_submodules)
+        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))
-            provider.create
-          end
+    context "with an ensure of bare" do
+      context "with revision" do
+        it "should just execute 'git clone --bare'" do
+          resource[:ensure] = :bare
+          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
+          provider.create
+        end
+      end
+      context "without revision" do
+        it "should just execute 'git clone --bare'" do
+          resource[:ensure] = :bare
+          resource.delete(:revision)
+          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
+          provider.create
         end
       end
     end
 
     context "when a source is not given" do
-      resource_with :ensure => :present do
-        context "when the path does not exist" do
-          it "should execute 'git init'" do
-            expects_mkdir
-            expects_chdir
-            expects_directory?(false)
-            provider.expects(:bare_exists?).returns(false)
-            provider.expects(:git).with('init')
-            provider.create
-          end
-        end
+      context "when the path does not exist" do
+        it "should execute 'git init'" do
+          resource[:ensure] = :present
+          resource.delete(:source)
+          expects_mkdir
+          expects_chdir
+          expects_directory?(false)
 
-        context "when the path is a bare repository" do
-          it "should convert it to a working copy" do
-            provider.expects(:bare_exists?).returns(true)
-            provider.expects(:convert_bare_to_working_copy)
-            provider.create
-          end
+          provider.expects(:bare_exists?).returns(false)
+          provider.expects(:git).with('init')
+          provider.create
         end
+      end
 
-        context "when the path is not empty and not a repository" do
-          it "should raise an exception" do
-            provider.expects(:path_exists?).returns(true)
-            provider.expects(:path_empty?).returns(false)
-            proc { provider.create }.should raise_error(Puppet::Error)
-          end
+      context "when the path is a bare repository" do
+        it "should convert it to a working copy" do
+          resource[:ensure] = :present
+          resource.delete(:source)
+          provider.expects(:bare_exists?).returns(true)
+          provider.expects(:convert_bare_to_working_copy)
+          provider.create
         end
       end
 
-      resource_with :ensure => :bare do
-        context "when the path does not exist" do
-          it "should execute 'git init --bare'" do
-            expects_chdir
-            expects_mkdir
-            expects_directory?(false)
-            provider.expects(:working_copy_exists?).returns(false)
-            provider.expects(:git).with('init', '--bare')
-            provider.create
-          end
+      context "when the path is not empty and not a repository" do
+        it "should raise an exception" do
+          provider.expects(:path_exists?).returns(true)
+          provider.expects(:path_empty?).returns(false)
+          proc { provider.create }.should raise_error(Puppet::Error)
         end
+      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)
-            provider.expects(:convert_working_copy_to_bare)
-            provider.create
-          end
-        end
+    context "when the path does not exist" do
+      it "should execute 'git init --bare'" do
+        resource[:ensure] = :bare
+        resource.delete(:source)
+        expects_chdir
+        expects_mkdir
+        expects_directory?(false)
+        provider.expects(:working_copy_exists?).returns(false)
+        provider.expects(:git).with('init', '--bare')
+        provider.create
+      end
+    end
 
-        context "when the path is not empty and not a repository" do
-          it "should raise an exception" do
-            expects_directory?(true)
-            provider.expects(:path_empty?).returns(false)
-            proc { provider.create }.should raise_error(Puppet::Error)
-          end
-        end
+    context "when the path is a working copy repository" do
+      it "should convert it to a bare repository" do
+        resource[:ensure] = :bare
+        resource.delete(:source)
+        provider.expects(:working_copy_exists?).returns(true)
+        provider.expects(:convert_working_copy_to_bare)
+        provider.create
       end
     end
 
+    context "when the path is not empty and not a repository" do
+      it "should raise an exception" do
+        expects_directory?(true)
+        provider.expects(:path_empty?).returns(false)
+        proc { provider.create }.should raise_error(Puppet::Error)
+      end
+    end
   end
 
+
   context 'destroying' do
     it "it should remove the directory" do
-      expects_rm_rf
+      #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
+    before do
+      expects_chdir('/tmp/test')
+      resource[:revision] = 'currentsha'
+      resource.delete(:source)
+      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('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.revision.should == resource.value(:revision)
-        end
+    context "when its SHA is not different than the current SHA" do
+      it "should return the ref" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('rev-parse', '--revs-only', 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('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.revision.should == 'currentsha'
-        end
+    context "when its SHA is different than the current SHA" do
+      it "should return the current SHA" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.revision.should == 'currentsha'
       end
+    end
 
-      context "when its a ref to a remote head" do
-        it "should return the revision" do
-          provider.expects(:git).with('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-          provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}")
-          provider.revision.should == 'currentsha'
-        end
+    context "when its a ref to a remote head" do
+      it "should return the revision" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
+        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}")
+        provider.revision.should == 'currentsha'
       end
+    end
 
-      context "when its a ref to non existant remote head" do
-        it "should fail" do
-          provider.expects(:git).with('config', 'remote.origin.url').returns('')
-          provider.expects(:git).with('fetch', 'origin') # FIXME
-          provider.expects(:git).with('fetch', '--tags', 'origin')
-          provider.expects(:git).with('tag', '-l').returns("Hello")
-          provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-          provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('')
-          expect { provider.revision }.should raise_error(Puppet::Error, /not a local or remote ref$/)
-        end
+    context "when its a ref to non existant remote head" do
+      it "should fail" do
+        provider.expects(:git).with('config', 'remote.origin.url').returns('')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
+        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('')
+        expect { provider.revision }.to raise_error(Puppet::Error, /not a local or remote ref$/)
       end
+    end
 
-      context "when the source is modified" do
-        resource_with :source => 'git://git@foo.com/bar.git' do
-          it "should update the origin url" do
-            provider.expects(:git).with('config', 'remote.origin.url').returns('old')
-            provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git')
-            provider.expects(:git).with('fetch', 'origin') # FIXME
-            provider.expects(:git).with('fetch', '--tags', 'origin')
-            provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-            provider.expects(:git).with('tag', '-l').returns("Hello")
-            provider.revision.should == resource.value(:revision)
-          end
-        end
+    context "when the source is modified" do
+      it "should update the origin url" do
+        resource[:source] = 'git://git@foo.com/bar.git'
+        provider.expects(:git).with('config', 'remote.origin.url').returns('old')
+        provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git')
+        provider.expects(:git).with('fetch', 'origin') # FIXME
+        provider.expects(:git).with('fetch', '--tags', 'origin')
+        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
+        provider.expects(:git).with('tag', '-l').returns("Hello")
+        provider.revision.should == resource.value(:revision)
       end
     end
   end
@@ -195,8 +215,9 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
     before do
       expects_chdir
     end
-    context "when it's an existing local branch", :resource => {:revision => 'feature/foo'} do
+    context "when it's an existing local branch" do
       it "should use 'git fetch' and 'git reset'" do
+        resource[:revision] = 'feature/foo'
         provider.expects(:update_submodules)
         provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
         provider.expects(:git).with('checkout', '--force', resource.value(:revision))
@@ -205,8 +226,9 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
         provider.revision = resource.value(:revision)
       end
     end
-    context "when it's a remote branch", :resource => {:revision => 'only/remote'} do
+    context "when it's a remote branch" do
       it "should use 'git fetch' and 'git reset'" do
+        resource[:revision] = 'only/remote'
         provider.expects(:update_submodules)
         provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
         provider.expects(:git).with('checkout', '--force', resource.value(:revision))
@@ -215,8 +237,9 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
         provider.revision = resource.value(:revision)
       end
     end
-    context "when it's a commit or tag", :resource => {:revision => 'a-commit-or-tag'} do
+    context "when it's a commit or tag" do
       it "should use 'git fetch' and 'git reset'" do
+        resource[:revision] = 'a-commit-or-tag'
         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))
@@ -229,6 +252,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
 
   context "updating references" do
     it "should use 'git fetch --tags'" do
+      resource.delete(:source)
       expects_chdir
       provider.expects(:git).with('config', 'remote.origin.url').returns('')
       provider.expects(:git).with('fetch', 'origin')
@@ -243,25 +267,29 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
       provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
     end
     context "is a local branch" do
-      context "when it's listed in 'git branch -a'", :resource => {:revision => 'feature/foo'} do
+      context "when it's listed in 'git branch -a'" do
         it "should return true" do
+          resource[:revision] = 'feature/foo'
           provider.should be_local_branch_revision
         end
       end
-      context "when it's not listed in 'git branch -a'" , :resource => {:revision => 'feature/notexist'}do
+      context "when it's not listed in 'git branch -a'" do
         it "should return false" do
+          resource[:revision] = 'feature/notexist'
           provider.should_not be_local_branch_revision
         end
       end
     end
     context "is a remote branch" do
-      context "when it's listed in 'git branch -a' with an 'origin/' prefix", :resource => {:revision => 'only/remote'} do
+      context "when it's listed in 'git branch -a' with an 'origin/' prefix" do
         it "should return true" do
+          resource[:revision] = 'only/remote'
           provider.should be_remote_branch_revision
         end
       end
-      context "when it's not listed in 'git branch -a' with an 'origin/' prefix" , :resource => {:revision => 'only/local'}do
+      context "when it's not listed in 'git branch -a' with an 'origin/' prefix" do
         it "should return false" do
+          resource[:revision] = 'only/local'
           provider.should_not be_remote_branch_revision
         end
       end
diff --git a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
index f17aa2f..7fd5348 100644
--- a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
@@ -1,24 +1,38 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:hg) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :hg,
+    :path     => '/tmp/vcsrepo',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('hg').returns('/usr/bin/hg')
+  end
 
   describe 'creating' do
-    resource_with :source do
-      resource_with :revision do
-        it "should execute 'hg clone -u' with the revision" do
-          provider.expects(:hg).with('clone', '-u',
-                                      resource.value(:revision),
-                                      resource.value(:source),
-                                      resource.value(:path))
-          provider.create
-        end
+    context 'with source and revision' do
+      it "should execute 'hg clone -u' with the revision" do
+        resource[:source] = 'something'
+        resource[:revision] = '1'
+        provider.expects(:hg).with('clone', '-u',
+          resource.value(:revision),
+          resource.value(:source),
+          resource.value(:path))
+        provider.create
       end
+    end
 
-      resource_without :revision do
-        it "should just execute 'hg clone' without a revision" do
-          provider.expects(:hg).with('clone', resource.value(:source), resource.value(:path))
-          provider.create
-        end
+    context 'without revision' do
+      it "should just execute 'hg clone' without a revision" do
+        resource[:source] = 'something'
+        provider.expects(:hg).with('clone', resource.value(:source), resource.value(:path))
+        provider.create
       end
     end
 
@@ -55,14 +69,16 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
         provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
       end
 
-      context "when its SHA is not different than the current SHA", :resource => {:revision => '0.6'} do
+      context "when its SHA is not different than the current SHA" do
         it "should return the ref" do
+          resource[:revision] = '0.6'
           provider.revision.should == '0.6'
         end
       end
 
-      context "when its SHA is different than the current SHA", :resource => {:revision => '0.5.3'} do
+      context "when its SHA is different than the current SHA" do
         it "should return the current SHA" do
+          resource[:revision] = '0.5.3'
           provider.revision.should == '34e6012c783a'
         end
       end
@@ -74,6 +90,7 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
 
       context "when it is the same as the current SHA", :resource => {:revision => '34e6012c783a'} do
         it "should return it" do
+          resource[:revision] = '34e6012c783a'
           provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
           provider.revision.should == resource.value(:revision)
         end
@@ -81,6 +98,7 @@ describe_provider :vcsrepo, :hg, :resource => {:path => '/tmp/vcsrepo'} do
 
       context "when it is not the same as the current SHA", :resource => {:revision => 'not-the-same'} do
         it "should return the current SHA" do
+          resource[:revision] = 'not-the-same'
           provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
           provider.revision.should == '34e6012c783a'
         end
diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
index 5c03327..f44e314 100644
--- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
@@ -1,41 +1,55 @@
 require 'spec_helper'
 
-describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do
+describe Puppet::Type.type(:vcsrepo).provider(:svn) do
+
+  let(:resource) { Puppet::Type.type(:vcsrepo).new({
+    :name     => 'test',
+    :ensure   => :present,
+    :provider => :svn,
+    :path     => '/tmp/vcsrepo',
+  })}
+
+  let(:provider) { resource.provider }
+
+  before :each do
+    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
+  end
 
   describe 'creating' do
-    resource_with :source do
-      resource_with :revision do
-        it "should execute 'svn checkout' with a revision" do
-          provider.expects(:svn).with('--non-interactive', 'checkout', '-r',
-                                      resource.value(:revision),
-                                      resource.value(:source),
-                                      resource.value(:path))
-          provider.create
-        end
+    context 'with source and revision' do
+      it "should execute 'svn checkout' with a revision" do
+        resource[:source] = 'exists'
+        resource[:revision] = '1'
+        provider.expects(:svn).with('--non-interactive', 'checkout', '-r',
+          resource.value(:revision),
+          resource.value(:source),
+          resource.value(:path))
+        provider.create
       end
-      resource_without :revision do
-        it "should just execute 'svn checkout' without a revision" do
-          provider.expects(:svn).with('--non-interactive', 'checkout',
-                                      resource.value(:source),
-                                      resource.value(:path))
-          provider.create
-        end
+    end
+    context 'with source' do
+      it "should just execute 'svn checkout' without a revision" do
+        resource[:source] = 'exists'
+        provider.expects(:svn).with('--non-interactive', 'checkout',
+          resource.value(:source),
+          resource.value(:path))
+        provider.create
       end
     end
-    resource_without :source do
-      resource_with :fstype do
-        it "should execute 'svnadmin create' with an '--fs-type' option" do
-          provider.expects(:svnadmin).with('create', '--fs-type',
-                                           resource.value(:fstype),
-                                           resource.value(:path))
-          provider.create
-        end
+
+    context 'with fstype' do
+      it "should execute 'svnadmin create' with an '--fs-type' option" do
+        resource[:fstype] = 'ext4'
+        provider.expects(:svnadmin).with('create', '--fs-type',
+                                          resource.value(:fstype),
+                                          resource.value(:path))
+        provider.create
       end
-      resource_without :fstype do
-        it "should execute 'svnadmin create' without an '--fs-type' option" do
-          provider.expects(:svnadmin).with('create', resource.value(:path))
-          provider.create
-        end
+    end
+    context 'without fstype' do
+      it "should execute 'svnadmin create' without an '--fs-type' option" do
+        provider.expects(:svnadmin).with('create', resource.value(:path))
+        provider.create
       end
     end
   end
@@ -69,12 +83,10 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do
     before do
       @revision = '30'
     end
-    resource_without :source do
-      it "should use 'svn update'" do
-        expects_chdir
-        provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision)
-        provider.revision = @revision
-      end
+    it "should use 'svn update'" do
+      expects_chdir
+      provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision)
+      provider.revision = @revision
     end
   end
 
@@ -82,12 +94,11 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do
     before do
       @revision = '30'
     end
-    resource_with :source do
-      it "should use 'svn switch'" do
-        expects_chdir
-        provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value')
-        provider.revision = @revision
-      end
+    it "should use 'svn switch'" do
+      resource[:source] = 'an-unimportant-value'
+      expects_chdir
+      provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value')
+      provider.revision = @revision
     end
   end