diff options
| -rwxr-xr-x | spec/unit/node.rb | 4 | ||||
| -rwxr-xr-x | test/network/client/master.rb | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/spec/unit/node.rb b/spec/unit/node.rb index cd221498b..a72c117ff 100755 --- a/spec/unit/node.rb +++ b/spec/unit/node.rb @@ -45,7 +45,7 @@ describe Puppet::Node, "when initializing" do end it "should accept an environment value" do - Puppet.settings.stubs(:value).with(:environments).returns("myenv") + Puppet.settings.stubs(:value).with(:environment).returns("myenv") @node = Puppet::Node.new("testing", :environment => "myenv") @node.environment.should == "myenv" end @@ -53,7 +53,7 @@ end describe Puppet::Node, "when returning the environment" do before do - Puppet.settings.stubs(:value).with(:environments).returns("one,two") + Puppet.settings.stubs(:value).with(:environment).returns("one,two") Puppet.settings.stubs(:value).with(:environment).returns("one") @node = Puppet::Node.new("testnode") end diff --git a/test/network/client/master.rb b/test/network/client/master.rb index 0c1405217..4a749ac44 100755 --- a/test/network/client/master.rb +++ b/test/network/client/master.rb @@ -419,8 +419,7 @@ end assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts") # Now set it to a real value - Puppet[:environments] = "something,else" - Puppet[:environment] = "something" + Puppet[:environment] = "something" facts = Puppet::Network::Client::Master.facts assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts") end |