Merge branch 'master' into staging

Leandro Santos
2 parents f48f3b18 b004dee3
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
test/functional/cms_controller_test.rb
@@ -528,7 +528,7 @@ class CmsControllerTest &lt; ActionController::TestCase
     post :new, :type => TextileArticle.name, :profile => profile.identifier, :article => { :name => 'adding-categories-test', :category_ids => [ c1.id, c3.id, c3.id ] }
  
     saved = profile.articles.find_by(name: 'adding-categories-test')
-    assert_equal [c1, c3], saved.categories.all
+    assert_equivalent [c1, c3], saved.categories.all
   end
  
   should 'filter html with white_list from tiny mce article name' do
...	...	@@ -528,7 +528,7 @@ class CmsControllerTest < ActionController::TestCase
528	528	post :new, :type => TextileArticle.name, :profile => profile.identifier, :article => { :name => 'adding-categories-test', :category_ids => [ c1.id, c3.id, c3.id ] }
529	529
530	530	saved = profile.articles.find_by(name: 'adding-categories-test')
531		- assert_equal [c1, c3], saved.categories.all
	531	+ assert_equivalent [c1, c3], saved.categories.all
532	532	end
533	533
534	534	should 'filter html with white_list from tiny mce article name' do
...	...