summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-11-15 19:41:43 +1100
committerMarkus Roberts <Markus@reality.com>2010-11-16 10:54:22 -0800
commitc8b6fb5bed057bf25a25c9e1b3f55bedf64ba775 (patch)
treeb21dda185beaef1779cf579d9d48c6dd2d5a2067 /spec
parentd221c05e08627b9dffede6c56e210edca3b04c03 (diff)
downloadpuppet-c8b6fb5bed057bf25a25c9e1b3f55bedf64ba775.tar.gz
puppet-c8b6fb5bed057bf25a25c9e1b3f55bedf64ba775.tar.xz
puppet-c8b6fb5bed057bf25a25c9e1b3f55bedf64ba775.zip
Fixed #5296 - test warnings messages
Diffstat (limited to 'spec')
-rw-r--r--spec/integration/parser/ruby_manifest_spec.rb2
-rwxr-xr-xspec/unit/application/apply_spec.rb2
-rwxr-xr-xspec/unit/parser/ast/leaf_spec.rb2
-rwxr-xr-xspec/unit/parser/ast/resource_spec.rb4
-rwxr-xr-xspec/unit/rails_spec.rb18
5 files changed, 14 insertions, 14 deletions
diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb
index af110d3b3..de6f4628c 100644
--- a/spec/integration/parser/ruby_manifest_spec.rb
+++ b/spec/integration/parser/ruby_manifest_spec.rb
@@ -69,7 +69,7 @@ describe "Pure ruby manifests" do
write_file('foo.rb', "hostclass 'bar' do file 'test_file', :owner => 'root', :mode => '644' end")
catalog = compile("import 'foo'\ninclude bar")
file = catalog.resource("File[test_file]")
- file.should be_a Puppet::Resource
+ file.should be_a(Puppet::Resource)
file.type.should == 'File'
file.title.should == 'test_file'
file.exported.should_not be
diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb
index 85098f490..877c47bcc 100755
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@ -312,7 +312,7 @@ describe Puppet::Application::Apply do
end
it "should apply the catalog" do
- @catalog.expects(:apply).returns(stub_everything 'transaction')
+ @catalog.expects(:apply).returns(stub_everything('transaction'))
@apply.main
end
diff --git a/spec/unit/parser/ast/leaf_spec.rb b/spec/unit/parser/ast/leaf_spec.rb
index 384ee08eb..a19c24115 100755
--- a/spec/unit/parser/ast/leaf_spec.rb
+++ b/spec/unit/parser/ast/leaf_spec.rb
@@ -49,7 +49,7 @@ describe Puppet::Parser::AST::String do
end
it "should return a dup of its value" do
value = ""
- Puppet::Parser::AST::String.new( :value => value ).evaluate(stub 'scope').should_not be_equal(value)
+ Puppet::Parser::AST::String.new( :value => value ).evaluate(stub('scope')).should_not be_equal(value)
end
end
end
diff --git a/spec/unit/parser/ast/resource_spec.rb b/spec/unit/parser/ast/resource_spec.rb
index e1f73e161..721c31a8d 100755
--- a/spec/unit/parser/ast/resource_spec.rb
+++ b/spec/unit/parser/ast/resource_spec.rb
@@ -152,7 +152,7 @@ describe Puppet::Parser::AST::Resource do
result = @resource.evaluate(@scope)
result.length.should == 1
result.first.ref.should == "Class[Classname]"
- @compiler.catalog.resource("Class[Classname]").should equal result.first
+ @compiler.catalog.resource("Class[Classname]").should equal(result.first)
end
it "should cause its parent to be evaluated" do
@@ -163,7 +163,7 @@ describe Puppet::Parser::AST::Resource do
result = @resource.evaluate(@scope)
result.length.should == 1
result.first.ref.should == "Class[Classname]"
- @compiler.catalog.resource("Class[Classname]").should equal result.first
+ @compiler.catalog.resource("Class[Classname]").should equal(result.first)
@compiler.catalog.resource("Class[Parentname]").should be_instance_of(Puppet::Parser::Resource)
end
diff --git a/spec/unit/rails_spec.rb b/spec/unit/rails_spec.rb
index d30e52b8a..24248e622 100755
--- a/spec/unit/rails_spec.rb
+++ b/spec/unit/rails_spec.rb
@@ -180,13 +180,13 @@ describe Puppet::Rails, "when initializing a mysql connection" do
Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
Puppet.settings.stubs(:value).with(:dbconnections).returns(0)
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
Puppet.settings.stubs(:value).with(:dbconnections).returns('0')
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
Puppet.settings.stubs(:value).with(:dbconnections).returns('')
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
end
end
@@ -253,13 +253,13 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
Puppet.settings.stubs(:value).with(:dbconnections).returns(0)
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
Puppet.settings.stubs(:value).with(:dbconnections).returns('0')
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
Puppet.settings.stubs(:value).with(:dbconnections).returns('')
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
end
end
@@ -313,12 +313,12 @@ describe Puppet::Rails, "when initializing an Oracle connection" do
Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
Puppet.settings.stubs(:value).with(:dbconnections).returns(0)
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
Puppet.settings.stubs(:value).with(:dbconnections).returns('0')
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
Puppet.settings.stubs(:value).with(:dbconnections).returns('')
- Puppet::Rails.database_arguments.should_not be_include :pool
+ Puppet::Rails.database_arguments.should_not be_include(:pool)
end
end