diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/integration/account_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/account_test.rb')
| -rw-r--r-- | test/integration/account_test.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb index 2a5579435..63320b72d 100644 --- a/test/integration/account_test.rb +++ b/test/integration/account_test.rb @@ -17,13 +17,7 @@ require File.expand_path('../../test_helper', __FILE__) -begin - require 'mocha/setup' -rescue - # Won't run some tests -end - -class AccountTest < ActionController::IntegrationTest +class AccountTest < ActionDispatch::IntegrationTest fixtures :users, :roles def test_login |