Merge branch 'replace-warden-helpers-with-devise' into registry-790

# Conflicts:
#	test/integration/admin/domains_test.rb
This commit is contained in:
Artur Beljajev 2018-06-20 12:32:08 +03:00
commit eddf39ea9b
51 changed files with 53 additions and 52 deletions

View file

@ -2,7 +2,7 @@ require 'test_helper'
class AdminDomainsTestTest < ActionDispatch::IntegrationTest
def setup
login_as users(:admin)
sign_in users(:admin)
@domain = domains(:shop)
end