Merge branch 'maint/2.6.next/5771-spec-fixes' into 2.6.next

4 files changed, 6 insertions, 96 deletions

diff --git a/spec/integration/provider/mailalias/aliases_spec.rb b/spec/integration/provider/mailalias/aliases_spec.rb
index 0511205f2..1bce13f90 100755
--- a/spec/integration/provider/mailalias/aliases_spec.rb
+++ b/spec/integration/provider/mailalias/aliases_spec.rb
@@ -8,7 +8,6 @@ require 'puppettest/fileparsing'
 provider_class = Puppet::Type.type(:mailalias).provider(:aliases)
 
 describe provider_class do
-  include PuppetTest
   include PuppetTest::FileParsing
   include PuppetTest::Support::Utils
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d0ee7d92a..ed4e826c9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,6 +6,7 @@ dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir
 $LOAD_PATH.unshift("#{dir}/../lib")
+$LOAD_PATH.unshift("#{dir}/../test/lib")
 
 # Don't want puppet getting the command line arguments for rake or autotest
 ARGV.clear
@@ -19,6 +20,9 @@ module PuppetSpec
   FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
 end
 
+module PuppetTest
+end
+
 require 'lib/puppet_spec/files'
 require 'monkey_patches/alias_should_to_must'
 require 'monkey_patches/publicize_methods'
diff --git a/spec/spec_specs/runnable_spec.rb b/spec/spec_specs/runnable_spec.rb
deleted file mode 100644
index da4faca4e..000000000
--- a/spec/spec_specs/runnable_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe PuppetTest::RunnableTest do
-  before do
-    @runnable_test = Class.new.extend(PuppetTest::RunnableTest)
-  end
-
-  describe "#confine" do
-    subject { @runnable_test }
-
-    it "should accept a hash" do
-      subject.confine({}).should_not raise_error(ArgumentError)
-    end
-
-    it "should accept a message and a block" do
-      subject.confine(""){}.should_not raise_error(ArgumentError)
-    end
-
-  end
-
-  describe "#runnable?" do
-    describe "when the superclass is not runnable" do
-      before { @runnable_test.stubs(:superclass).returns(stub("unrunnable superclass", :runnable? => false)) }
-      subject { @runnable_test.runnable? }
-
-      it { should be_false }
-    end
-
-    describe "when a confine is false" do
-      before { @runnable_test.confine(:message => false) }
-      subject { @runnable_test.runnable? }
-
-      it { should be_false }
-    end
-
-    describe "when a confine has a block that returns false" do
-      before { @runnable_test.confine(:message){ false } }
-      subject { @runnable_test.runnable? }
-
-      it { should be_false }
-    end
-
-    describe "when a confine is true and no false confines" do
-      before { @runnable_test.confine(:message => true) }
-      subject { @runnable_test.runnable? }
-
-      it { should be_true }
-    end
-
-    describe "when a confine has block that returns true and no false confines" do
-      before { @runnable_test.confine(:message){ true } }
-      subject { @runnable_test.runnable? }
-
-      it { should be_true }
-    end
-
-  end
-
-  describe "#messages" do
-    describe "before runnable? is called" do
-      subject { @runnable_test.messages }
-
-      it { should == [] }
-    end
-
-    describe "when runnable? is called and returns false" do
-      before do
-        @runnable_test.confine(:message => false)
-        @runnable_test.runnable?
-      end
-
-      subject { @runnable_test.messages }
-
-      it "should include the failed confine's message" do
-        should include(:message)
-      end
-
-    end
-
-    describe "when runnable? is called whose block returns false" do
-      before do
-        @runnable_test.confine(:message){ false }
-        @runnable_test.runnable?
-      end
-
-      subject { @runnable_test.messages }
-
-      it "should include the failed confine's message" do
-        should include(:message)
-      end
-
-    end
-
-  end
-end
diff --git a/test/lib/puppettest/fileparsing.rb b/test/lib/puppettest/fileparsing.rb
index 914c4bcb3..bd4f9e152 100644
--- a/test/lib/puppettest/fileparsing.rb
+++ b/test/lib/puppettest/fileparsing.rb
@@ -1,3 +1,5 @@
+require 'test/unit'
+
 module PuppetTest::FileParsing
   # Run an isomorphism test on our parsing process.
   def fakedataparse(*files)