From 6de31605d99710d887bd84e7245a1ec66ed3c9c5 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 8 Aug 2018 19:36:14 +0300 Subject: [PATCH] Integrate master branch --- .../api_user => system/admin_area/api_users}/new_test.rb | 2 +- .../admin => system/admin_area}/protected_area_test.rb | 2 +- .../admin/login_test.rb => system/admin_area/sign_in_test.rb} | 2 +- .../logout_test.rb => system/admin_area/sign_out_test.rb} | 2 +- .../registrar_area}/protected_area_test.rb | 2 +- .../{sign_in_test.rb => sign_in/mobile_id_test.rb} | 4 ++-- .../registrar_area/sign_in/password_test.rb} | 2 +- .../logout_test.rb => system/registrar_area/sign_out_test.rb} | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename test/{integration/admin/api_user => system/admin_area/api_users}/new_test.rb (90%) rename test/{integration/admin => system/admin_area}/protected_area_test.rb (90%) rename test/{integration/admin/login_test.rb => system/admin_area/sign_in_test.rb} (95%) rename test/{integration/admin/logout_test.rb => system/admin_area/sign_out_test.rb} (79%) rename test/{integration/registrar => system/registrar_area}/protected_area_test.rb (90%) rename test/system/registrar_area/{sign_in_test.rb => sign_in/mobile_id_test.rb} (89%) rename test/{integration/registrar/login_test.rb => system/registrar_area/sign_in/password_test.rb} (93%) rename test/{integration/registrar/logout_test.rb => system/registrar_area/sign_out_test.rb} (79%) diff --git a/test/integration/admin/api_user/new_test.rb b/test/system/admin_area/api_users/new_test.rb similarity index 90% rename from test/integration/admin/api_user/new_test.rb rename to test/system/admin_area/api_users/new_test.rb index 32b2e1188..aed012fdc 100644 --- a/test/integration/admin/api_user/new_test.rb +++ b/test/system/admin_area/api_users/new_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaNewApiUserTest < ActionDispatch::IntegrationTest +class AdminAreaNewApiUserTest < ApplicationSystemTestCase setup do sign_in users(:admin) end diff --git a/test/integration/admin/protected_area_test.rb b/test/system/admin_area/protected_area_test.rb similarity index 90% rename from test/integration/admin/protected_area_test.rb rename to test/system/admin_area/protected_area_test.rb index 59edb04c3..8aea012f0 100644 --- a/test/integration/admin/protected_area_test.rb +++ b/test/system/admin_area/protected_area_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaProtectedAreaTest < ActionDispatch::IntegrationTest +class AdminAreaProtectedAreaTest < ApplicationSystemTestCase def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area visit admin_domains_url assert_text 'You need to sign in before continuing' diff --git a/test/integration/admin/login_test.rb b/test/system/admin_area/sign_in_test.rb similarity index 95% rename from test/integration/admin/login_test.rb rename to test/system/admin_area/sign_in_test.rb index 364b6a0ba..dcef0e3aa 100644 --- a/test/integration/admin/login_test.rb +++ b/test/system/admin_area/sign_in_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaLoginTest < ActionDispatch::IntegrationTest +class AdminAreaSignInTest < ApplicationSystemTestCase def setup @user = users(:admin) end diff --git a/test/integration/admin/logout_test.rb b/test/system/admin_area/sign_out_test.rb similarity index 79% rename from test/integration/admin/logout_test.rb rename to test/system/admin_area/sign_out_test.rb index 159dc8de3..046abba95 100644 --- a/test/integration/admin/logout_test.rb +++ b/test/system/admin_area/sign_out_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class AdminAreaLogoutTest < ActionDispatch::IntegrationTest +class AdminAreaSignOutTest < ApplicationSystemTestCase def setup sign_in users(:admin) end diff --git a/test/integration/registrar/protected_area_test.rb b/test/system/registrar_area/protected_area_test.rb similarity index 90% rename from test/integration/registrar/protected_area_test.rb rename to test/system/registrar_area/protected_area_test.rb index dd7f46980..08dd6a63e 100644 --- a/test/integration/registrar/protected_area_test.rb +++ b/test/system/registrar_area/protected_area_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaProtectedAreaTest < ActionDispatch::IntegrationTest +class RegistrarAreaProtectedAreaTest < ApplicationSystemTestCase def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area visit registrar_domains_url assert_text 'You need to sign in before continuing' diff --git a/test/system/registrar_area/sign_in_test.rb b/test/system/registrar_area/sign_in/mobile_id_test.rb similarity index 89% rename from test/system/registrar_area/sign_in_test.rb rename to test/system/registrar_area/sign_in/mobile_id_test.rb index 840839ccc..ecca00c56 100644 --- a/test/system/registrar_area/sign_in_test.rb +++ b/test/system/registrar_area/sign_in/mobile_id_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaSignInTest < JavaScriptApplicationSystemTestCase +class RegistrarAreaMobileIDSignInTest < JavaScriptApplicationSystemTestCase def setup super WebMock.allow_net_connect! @@ -10,7 +10,7 @@ class RegistrarAreaSignInTest < JavaScriptApplicationSystemTestCase @user.save end - def test_mobile_id_sign_in_page + def test_valid_phone_number mock_client = Minitest::Mock.new mock_client.expect(:authenticate, OpenStruct.new(user_id_code: '1234', challenge_id: '1234'), diff --git a/test/integration/registrar/login_test.rb b/test/system/registrar_area/sign_in/password_test.rb similarity index 93% rename from test/integration/registrar/login_test.rb rename to test/system/registrar_area/sign_in/password_test.rb index a70a9cf25..6878cd119 100644 --- a/test/integration/registrar/login_test.rb +++ b/test/system/registrar_area/sign_in/password_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaLoginTest < ActionDispatch::IntegrationTest +class RegistrarAreaPasswordSignInTest < ApplicationSystemTestCase def setup @user = users(:api_bestnames) end diff --git a/test/integration/registrar/logout_test.rb b/test/system/registrar_area/sign_out_test.rb similarity index 79% rename from test/integration/registrar/logout_test.rb rename to test/system/registrar_area/sign_out_test.rb index 9f2bba9dd..029167d48 100644 --- a/test/integration/registrar/logout_test.rb +++ b/test/system/registrar_area/sign_out_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class RegistrarAreaLogoutTest < ActionDispatch::IntegrationTest +class RegistrarAreaSignOutTest < ApplicationSystemTestCase def setup sign_in users(:api_bestnames) end