Merge remote-tracking branch 'upstream/pull/3377'

[rails.git] / test / controllers / api / traces_controller_test.rb

diff --git a/test/controllers/api/traces_controller_test.rb b/test/controllers/api/traces_controller_test.rb
index ea8476453512f7e0adcc0481378a7285d2c82f52..52df899ba0778e8f2b600ddf14d6272827aa66da 100644 (file)
--- a/test/controllers/api/traces_controller_test.rb
+++ b/test/controllers/api/traces_controller_test.rb
@@ -70,7 +70,7 @@ module Api
       assert_response :success
     end
 
       assert_response :success
     end
 

-    # Check an anoymous trace can't be specifically fetched by another user
+    # Check an anonymous trace can't be specifically fetched by another user

     def test_show_anon
       anon_trace_file = create(:trace, :visibility => "private")
 
     def test_show_anon
       anon_trace_file = create(:trace, :visibility => "private")
 


@@ -307,7 +307,7 @@ module Api
 
       updated = Trace.find(trace.id)
       # Ensure there's only one tag in the database after updating
 
       updated = Trace.find(trace.id)
       # Ensure there's only one tag in the database after updating

-      assert_equal Tracetag.count, 1
+      assert_equal(1, Tracetag.count)

       # The new tag object might have a different id, so check the string representation
       assert_equal trace.tagstring, updated.tagstring
     end
       # The new tag object might have a different id, so check the string representation
       assert_equal trace.tagstring, updated.tagstring
     end