Tweaked wording used in some tests.

rails · Oct 25, 2015 · a97dcde · a97dcde
1 parent 6843cf6
commit a97dcde
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -93,13 +93,13 @@ def call(env)
       assert_kind_of AbstractController::ActionNotFound, env["action_dispatch.exception"]
       assert_equal "/404", env["PATH_INFO"]
       assert_equal "/not_found_original_exception", env["action_dispatch.original_path"]
-      [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
+      [404, { "Content-Type" => "text/plain" }, ["YOU FAILED"]]
     end
 
     @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
     get "/not_found_original_exception", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 404
-    assert_equal "YOU FAILED BRO", body
+    assert_equal "YOU FAILED", body
   end
 
   test "returns an empty response if custom exceptions app returns X-Cascade pass" do

diff --git a/actionview/test/fixtures/digestor/comments/_comment.html.erb b/actionview/test/fixtures/digestor/comments/_comment.html.erb
@@ -1 +1 @@
-Great story, bro!
+Great story!
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -83,10 +83,10 @@ def test_has_many_and_belongs_to_automatic_inverse_shares_objects_on_rating
 
     assert_equal rating.comment, comment, "The Rating's comment should be the original Comment"
 
-    rating.comment.body = "Brogramming is the act of programming, like a bro."
+    rating.comment.body = "Fennec foxes are the smallest of the foxes."
     assert_equal rating.comment.body, comment.body, "Changing the Comment's body on the association should change the original Comment's body"
 
-    comment.body = "Broseiden is the king of the sea of bros."
+    comment.body = "Kittens are adorable."
     assert_equal comment.body, rating.comment.body, "Changing the original Comment's body should change the Comment's body on the association"
   end
 
@@ -97,10 +97,10 @@ def test_has_many_and_belongs_to_automatic_inverse_shares_objects_on_comment
 
     assert_equal rating.comment, comment, "The Rating's comment should be the original Comment"
 
-    rating.comment.body = "Brogramming is the act of programming, like a bro."
+    rating.comment.body = "Fennec foxes are the smallest of the foxes."
     assert_equal rating.comment.body, comment.body, "Changing the Comment's body on the association should change the original Comment's body"
 
-    comment.body = "Broseiden is the king of the sea of bros."
+    comment.body = "Kittens are adorable."
     assert_equal comment.body, rating.comment.body, "Changing the original Comment's body should change the Comment's body on the association"
   end
 

diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
@@ -72,23 +72,23 @@ def flush(*)
   test "keeps each tag in their own thread" do
     @logger.tagged("BCX") do
       Thread.new do
-        @logger.tagged("OMG") { @logger.info "Cool story bro" }
+        @logger.tagged("OMG") { @logger.info "Cool story" }
       end.join
       @logger.info "Funky time"
     end
-    assert_equal "[OMG] Cool story bro\n[BCX] Funky time\n", @output.string
+    assert_equal "[OMG] Cool story\n[BCX] Funky time\n", @output.string
   end
 
   test "keeps each tag in their own instance" do
     @other_output = StringIO.new
     @other_logger = ActiveSupport::TaggedLogging.new(MyLogger.new(@other_output))
     @logger.tagged("OMG") do
       @other_logger.tagged("BCX") do
-        @logger.info "Cool story bro"
+        @logger.info "Cool story"
         @other_logger.info "Funky time"
       end
     end
-    assert_equal "[OMG] Cool story bro\n", @output.string
+    assert_equal "[OMG] Cool story\n", @output.string
     assert_equal "[BCX] Funky time\n", @other_output.string
   end
 
@@ -97,11 +97,11 @@ def flush(*)
       Thread.new do
         @logger.tagged("OMG") do
           @logger.flush
-          @logger.info "Cool story bro"
+          @logger.info "Cool story"
         end
       end.join
     end
-    assert_equal "[FLUSHED]\nCool story bro\n", @output.string
+    assert_equal "[FLUSHED]\nCool story\n", @output.string
   end
 
   test "mixed levels of tagging" do

diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
@@ -48,15 +48,15 @@ def index
     test "uses custom exceptions app" do
       add_to_config <<-RUBY
         config.exceptions_app = lambda do |env|
-          [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
+          [404, { "Content-Type" => "text/plain" }, ["YOU FAILED"]]
         end
       RUBY
 
       app.config.action_dispatch.show_exceptions = true
 
       get "/foo"
       assert_equal 404, last_response.status
-      assert_equal "YOU FAILED BRO", last_response.body
+      assert_equal "YOU FAILED", last_response.body
     end
 
     test "url generation error when action_dispatch.show_exceptions is set raises an exception" do
@@ -67,7 +67,7 @@ def index
           end
         end
       RUBY
-      
+
       app.config.action_dispatch.show_exceptions = true
 
       get '/foo'