1 files changed, 22 insertions, 29 deletions
diff --git a/test/models/search_test.rb b/test/models/search_test.rb
index 9614bc0..355beab 100644
--- a/test/models/search_test.rb
+++ b/test/models/search_test.rb
@@ -3,7 +3,7 @@
 require 'test_helper'
 
 class SearchTest < ActiveSupport::TestCase
-  test 'name and body have to be present and unique' do
+  test 'name and body have to be present' do
     search = Search.new(user_id: users(:user).id)
     assert_raise(ActiveRecord::RecordInvalid) { search.save! }
 
@@ -13,6 +13,10 @@ class SearchTest < ActiveSupport::TestCase
     search.name = nil
     search.body = 'body'
     assert_raise(ActiveRecord::RecordInvalid) { search.save! }
+  end
+
+  test 'name and body have to be unique' do
+    search = Search.new(user_id: users(:user).id)
 
     search.name = searches(:search1).name
     assert_raise(ActiveRecord::RecordInvalid) { search.save! }
@@ -20,9 +24,6 @@ class SearchTest < ActiveSupport::TestCase
     search.name = 'another'
     search.body = searches(:search1).body
     assert_raise(ActiveRecord::RecordInvalid) { search.save! }
-
-    search.body = 'another body'
-    assert_difference('Search.count') { search.save! }
   end
 
   ##
@@ -31,60 +32,52 @@ class SearchTest < ActiveSupport::TestCase
   test 'returns all things when an empty body is given' do
     res = Search.new.results
 
-    assert res[:things].size == 2
-    assert res[:things][0][:target] == things(:thing2).target
-    assert res[:things][1][:target] == things(:thing1).target
+    assert_equal 2, res[:things].size
+    assert_equal res[:things][0][:target], things(:thing2).target
+    assert_equal res[:things][1][:target], things(:thing1).target
   end
 
   test 'returns everything matching a specific tag' do
     res = Search.new(body: "tag:'#{tags(:tag1).name}'").results
 
-    assert res[:things].size == 2
-    assert res[:things][0][:target] == things(:thing2).target
-    assert res[:things][1][:target] == things(:thing1).target
-    assert res[:comments].size == 1
-    assert res[:comments][0][:id] == comments(:comment1).id
+    assert_equal res[:things].map(&:target), [things(:thing2).target, things(:thing1).target]
+    assert_equal res[:comments].map(&:id), [comments(:comment1).id]
   end
 
   test 'returns everything matching two tags' do
     res = Search.new(body: "tag:'#{tags(:tag1).name}' tag:'#{tags(:tag2).name}'").results
 
-    assert res[:things].size == 1
-    assert res[:things][0][:target] == things(:thing1).target
-    assert res[:comments].empty?
+    assert_equal 1, res[:things].size
+    assert_equal res[:things][0][:target], things(:thing1).target
+    assert_empty res[:comments]
   end
 
   test 'returns everything matching a given text' do
     res = Search.new(body: 'Miquel').results
 
-    assert res[:things].size == 2
-    assert res[:things][0][:target] == things(:thing2).target
-    assert res[:things][1][:target] == things(:thing1).target
-    assert res[:comments].size == 1
-    assert res[:comments][0][:id] == comments(:comment1).id
+    assert_equal res[:things].map(&:target), [things(:thing2).target, things(:thing1).target]
+    assert_equal res[:comments].map(&:id), [comments(:comment1).id]
   end
 
   test 'returns everything matching two tags and a given text' do
     res = Search.new(body: "Miquel tag:'#{tags(:tag1).name}' tag:'#{tags(:tag2).name}'").results
 
-    assert res[:things].size == 1
-    assert res[:things][0][:target] == things(:thing1).target
-    assert res[:comments].empty?
+    assert_equal 1, res[:things].size
+    assert_equal res[:things][0][:target], things(:thing1).target
+    assert_empty res[:comments]
   end
 
   test 'returns everything matching a given compound text' do
     res = Search.new(body: 'some other').results
 
-    assert res[:things].size == 2
-    assert res[:things][0][:target] == things(:thing2).target
-    assert res[:things][1][:target] == things(:thing1).target
-    assert res[:comments].empty?
+    assert_equal res[:things].map(&:target), [things(:thing2).target, things(:thing1).target]
+    assert_empty res[:comments]
   end
 
   test 'returns an empty result with unknown fields' do
     res = Search.new(body: 'whatever:"unknown"').results
 
-    assert res[:things].empty?
-    assert res[:comments].empty?
+    assert_empty res[:things]
+    assert_empty res[:comments]
   end
 end