ActionItem135: adding two new assertions

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1087 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem135: adding two new assertions
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1087 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent ab3487d7
Showing 2 changed files with 13 additions and 4 deletions Show diff stats
test/test_helper.rb
test/unit/region_test.rb
@@ -81,6 +81,14 @@ class Test::Unit::TestCase
     assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")
   end
+  def assert_includes(array, element)
+    assert(array.include?(element), "<#{array.inspect}> expected to include <#{element.inspect}>")
+  end
+
+  def assert_not_includes(array, element)
+    assert(!array.include?(element), "<#{array.inspect}> expected to NOT include <#{element.inspect}>")
+  end
+
   private
   def uses_host(name)
@@ -91,7 +99,7 @@ end
 class ActionController::IntegrationTest
   def login(username, password)
-    post '/account/login', :login => username, :password => password
+    post '/account/login', :user => { :login => username, :password => password }
     assert_response :redirect
     follow_redirect!
     assert_not_equal '/account/login', path
@@ -24,7 +24,8 @@ class RegionTest &lt; Test::Unit::TestCase
     possible = region.search_possible_validators('organization')
     assert possible.include?(org2)
-    assert possible.include?(org1)
+    assert_includes possible, org2
+    assert_includes possible, org1
   end
   should 'return search results without validators that are already associated to the current region' do
@@ -35,8 +36,8 @@ class RegionTest &lt; Test::Unit::TestCase
     region.validators << org1
     possible = region.search_possible_validators('organization')
-    assert possible.include?(org2)
-    assert !possible.include?(org1)
+    assert_includes possible, org2
+    assert_not_includes possible, org1
   end
 end
	@@ -81,6 +81,14 @@ class Test::Unit::TestCase		@@ -81,6 +81,14 @@ class Test::Unit::TestCase
81	assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")	81	assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")
82	end	82	end
83		83
		84	+ def assert_includes(array, element)
		85	+ assert(array.include?(element), "<#{array.inspect}> expected to include <#{element.inspect}>")
		86	+ end
		87	+
		88	+ def assert_not_includes(array, element)
		89	+ assert(!array.include?(element), "<#{array.inspect}> expected to NOT include <#{element.inspect}>")
		90	+ end
		91	+
84	private	92	private
85		93
86	def uses_host(name)	94	def uses_host(name)
	@@ -91,7 +99,7 @@ end		@@ -91,7 +99,7 @@ end
91		99
92	class ActionController::IntegrationTest	100	class ActionController::IntegrationTest
93	def login(username, password)	101	def login(username, password)
94	- post '/account/login', :login => username, :password => password	102	+ post '/account/login', :user => { :login => username, :password => password }
95	assert_response :redirect	103	assert_response :redirect
96	follow_redirect!	104	follow_redirect!
97	assert_not_equal '/account/login', path	105	assert_not_equal '/account/login', path