zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-623

Browse source 
# Conflicts:
#	test/integration/admin/registrars/show_registrar_test.rb
This commit is contained in:
Artur Beljajev 2018-04-12 17:16:58 +03:00
commit 7ffc62e370
34 changed files with 72 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/test_helper.rb
View file

@ -21,6 +21,10 @@ class ActiveSupport::TestCase
ActiveRecord::Migration.check_pending!
fixtures :all
teardown do
travel_back
end
end
class ActionDispatch::IntegrationTest
@ -29,8 +33,9 @@ class ActionDispatch::IntegrationTest
include Capybara::Minitest::Assertions
include AbstractController::Translation
def teardown
teardown do
Warden.test_reset!
WebMock.reset!
Capybara.reset_sessions!
Capybara.use_default_driver
end