Merge branch '0.25.x'

Conflicts:
	lib/puppet/ssl/host.rb
	spec/spec_helper.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/spec/unit/node/environment.rb b/spec/unit/node/environment.rb
index 9b0d5eefa..21c224f23 100755
--- a/spec/unit/node/environment.rb
+++ b/spec/unit/node/environment.rb
@@ -171,7 +171,7 @@ describe Puppet::Node::Environment do
                 env.expects(:modulepath).returns %w{/a}
                 Dir.expects(:entries).with("/a").returns %w{foo}
 
-                env.modules.should be_all{|mod| mod.environment == "testing" }
+                env.modules.each {|mod| mod.environment.should == env }
             end
 
             it "should cache the module list" do