summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGardner Bickford <gardner@invulnerable.org>2012-08-15 16:05:42 -0700
committerBryan McLellan <btm@opscode.com>2012-08-20 12:56:18 -0700
commit1899801ec4f2d98911fb68daba3420a6e0259253 (patch)
treecf30fb443133cea5bba36a83be0f538e43849179
parent1af6fa9d6b4361d7b65f9cfb196efdcbd1b4f31a (diff)
downloadchef-1899801ec4f2d98911fb68daba3420a6e0259253.tar.gz
Replaces non-corporate language 'crap' with more neutral wording
-rw-r--r--chef-expander/spec/fixtures/chef-expander.rb2
-rw-r--r--chef/spec/unit/provider/subversion_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/chef-expander/spec/fixtures/chef-expander.rb b/chef-expander/spec/fixtures/chef-expander.rb
index 00ff1908ab..84883abe2c 100644
--- a/chef-expander/spec/fixtures/chef-expander.rb
+++ b/chef-expander/spec/fixtures/chef-expander.rb
@@ -36,7 +36,7 @@ amqp_vhost '/config-file'
## Cluster Config, should be overridden by command line ##
node_count 42
-## Extraneous Crap (should be ignored and not raise an error) ##
+## Extraneous Config (should be ignored and not raise an error) ##
solr_ram_use "1024T"
another_setting "#{solr_ram_use} is an alot" \ No newline at end of file
diff --git a/chef/spec/unit/provider/subversion_spec.rb b/chef/spec/unit/provider/subversion_spec.rb
index 86c1510a7c..e441428d6c 100644
--- a/chef/spec/unit/provider/subversion_spec.rb
+++ b/chef/spec/unit/provider/subversion_spec.rb
@@ -141,7 +141,7 @@ describe Chef::Provider::Subversion do
end
it "returns a helpful message if data from `svn info` can't be parsed" do
- example_svn_info = "some random crap from an error message\n"
+ example_svn_info = "some random text from an error message\n"
exitstatus = mock("exitstatus")
exitstatus.stub!(:exitstatus).and_return(0)
@resource.revision "HEAD"
@@ -149,7 +149,7 @@ describe Chef::Provider::Subversion do
@stderr.stub!(:string).and_return("")
@provider.should_receive(:popen4).and_yield("no-pid","no-stdin",@stdout,@stderr).
and_return(exitstatus)
- lambda {@provider.revision_int}.should raise_error(RuntimeError, "Could not parse `svn info` data: some random crap from an error message")
+ lambda {@provider.revision_int}.should raise_error(RuntimeError, "Could not parse `svn info` data: some random text from an error message")
end