Integrate master branch

This commit is contained in:
Artur Beljajev 2018-08-08 19:36:14 +03:00
parent bf3b54367b
commit 6de31605d9
8 changed files with 9 additions and 9 deletions

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class AdminAreaNewApiUserTest < ActionDispatch::IntegrationTest class AdminAreaNewApiUserTest < ApplicationSystemTestCase
setup do setup do
sign_in users(:admin) sign_in users(:admin)
end end

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class AdminAreaProtectedAreaTest < ActionDispatch::IntegrationTest class AdminAreaProtectedAreaTest < ApplicationSystemTestCase
def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area
visit admin_domains_url visit admin_domains_url
assert_text 'You need to sign in before continuing' assert_text 'You need to sign in before continuing'

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class AdminAreaLoginTest < ActionDispatch::IntegrationTest class AdminAreaSignInTest < ApplicationSystemTestCase
def setup def setup
@user = users(:admin) @user = users(:admin)
end end

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class AdminAreaLogoutTest < ActionDispatch::IntegrationTest class AdminAreaSignOutTest < ApplicationSystemTestCase
def setup def setup
sign_in users(:admin) sign_in users(:admin)
end end

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class RegistrarAreaProtectedAreaTest < ActionDispatch::IntegrationTest class RegistrarAreaProtectedAreaTest < ApplicationSystemTestCase
def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area
visit registrar_domains_url visit registrar_domains_url
assert_text 'You need to sign in before continuing' assert_text 'You need to sign in before continuing'

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class RegistrarAreaSignInTest < JavaScriptApplicationSystemTestCase class RegistrarAreaMobileIDSignInTest < JavaScriptApplicationSystemTestCase
def setup def setup
super super
WebMock.allow_net_connect! WebMock.allow_net_connect!
@ -10,7 +10,7 @@ class RegistrarAreaSignInTest < JavaScriptApplicationSystemTestCase
@user.save @user.save
end end
def test_mobile_id_sign_in_page def test_valid_phone_number
mock_client = Minitest::Mock.new mock_client = Minitest::Mock.new
mock_client.expect(:authenticate, mock_client.expect(:authenticate,
OpenStruct.new(user_id_code: '1234', challenge_id: '1234'), OpenStruct.new(user_id_code: '1234', challenge_id: '1234'),

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class RegistrarAreaLoginTest < ActionDispatch::IntegrationTest class RegistrarAreaPasswordSignInTest < ApplicationSystemTestCase
def setup def setup
@user = users(:api_bestnames) @user = users(:api_bestnames)
end end

View file

@ -1,6 +1,6 @@
require 'test_helper' require 'test_helper'
class RegistrarAreaLogoutTest < ActionDispatch::IntegrationTest class RegistrarAreaSignOutTest < ApplicationSystemTestCase
def setup def setup
sign_in users(:api_bestnames) sign_in users(:api_bestnames)
end end