Swap assert_equal arguments. Expected result should come first.

rafalbromirski · Apr 20, 2012 · 96e2087 · 96e2087
1 parent ccc4d64
commit 96e2087
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/test/models/attachment_file_test.rb b/test/models/attachment_file_test.rb
@@ -6,13 +6,13 @@ class AttachmentFileTest < ActiveSupport::TestCase
 
     # TODO: fix filename parameterization
     if CKEDITOR_BACKEND == :paperclip
-      assert_equal @attachment.data_file_name, "rails_tar.gz"
+      assert_equal "rails_tar.gz", @attachment.data_file_name
     else
-      assert_equal @attachment.data_file_name, "rails.tar.gz"
+      assert_equal "rails.tar.gz", @attachment.data_file_name
     end
 
-    assert_equal @attachment.data_content_type, "application/x-gzip"
-    assert_equal @attachment.data_file_size, 6823
-    assert_equal @attachment.url_thumb, "/assets/ckeditor/filebrowser/images/thumbs/gz.gif"
+    assert_equal "application/x-gzip", @attachment.data_content_type
+    assert_equal 6823, @attachment.data_file_size
+    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/gz.gif", @attachment.url_thumb
   end
 end
diff --git a/test/models/picture_test.rb b/test/models/picture_test.rb
@@ -4,14 +4,14 @@ class PictureTest < ActiveSupport::TestCase
   test "Set file content_type and size" do
     @picture = create_picture
 
-    assert_equal @picture.data_content_type, "image/png"
-    assert_equal @picture.data_file_name, "rails.png"
-    assert_equal @picture.data_file_size, 6646
+    assert_equal "image/png", @picture.data_content_type
+    assert_equal "rails.png", @picture.data_file_name
+    assert_equal 6646, @picture.data_file_size
     assert  @picture.url_thumb.include?('thumb_rails.png')
 
     if @picture.has_dimensions?
-      assert_equal @picture.width, 50
-      assert_equal @picture.height, 64
+      assert_equal 50, @picture.width
+      assert_equal 64, @picture.height
     end
   end
 end
diff --git a/test/models/utils_test.rb b/test/models/utils_test.rb
@@ -4,16 +4,16 @@ class UtilsTest < ActiveSupport::TestCase
   test 'exists filethumb' do
     ["avi", "doc", "docx", "exe", "gz", "htm", "jpg", "mp3", "mpg", "pdf", 
      "psd", "rar", "swf", "tar", "txt", "wmv", "xlsx", "zip"].each do |ext|
-      assert_equal Ckeditor::Utils.filethumb("somefile.#{ext}"), "/assets/ckeditor/filebrowser/images/thumbs/#{ext}.gif"
+      assert_equal "/assets/ckeditor/filebrowser/images/thumbs/#{ext}.gif", Ckeditor::Utils.filethumb("somefile.#{ext}")
     end
 
-    assert_equal Ckeditor::Utils.filethumb("somefile.ddd"), "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif"
+    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
   end
 
   test 'wrong filethumb' do    
-    assert_equal Ckeditor::Utils.filethumb("somefile.ddd"), "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif"
-    assert_equal Ckeditor::Utils.filethumb("somefile"), "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif"
-    assert_equal Ckeditor::Utils.filethumb(""), "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif"
-    assert_equal Ckeditor::Utils.filethumb(nil), "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif"
+    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
+    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile")
+    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("")
+    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb(nil)
   end
 end