Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 2 insertions, 2 deletions

diff --git a/test/integration/api_test/issue_relations_test.rb b/test/integration/api_test/issue_relations_test.rb
index 55fd761a9..46a14462e 100644
--- a/test/integration/api_test/issue_relations_test.rb
+++ b/test/integration/api_test/issue_relations_test.rb
@@ -75,7 +75,7 @@ class ApiTest::IssueRelationsTest < ActionController::IntegrationTest
           end
 
           assert_response :unprocessable_entity
-          assert_tag :errors, :child => {:tag => 'error', :content => 'relation_type is not included in the list'}
+          assert_tag :errors, :child => {:tag => 'error', :content => /relation_type is not included in the list/}
         end
       end
     end
diff --git a/test/integration/api_test/memberships_test.rb b/test/integration/api_test/memberships_test.rb
index dcda2c4dd..0243b3f04 100644
--- a/test/integration/api_test/memberships_test.rb
+++ b/test/integration/api_test/memberships_test.rb
@@ -167,7 +167,7 @@ class ApiTest::MembershipsTest < ActionController::IntegrationTest
 
           assert_response :unprocessable_entity
           assert_equal 'application/xml', @response.content_type
-          assert_tag 'errors', :child => {:tag => 'error', :content => "member_roles is invalid"}
+          assert_tag 'errors', :child => {:tag => 'error', :content => /member_roles is invalid/}
         end
       end
     end