diff --git a/test/integration/admin_area/admin_users_test.rb b/test/integration/admin_area/admin_users_test.rb index 5d45d3146..89b9edef9 100644 --- a/test/integration/admin_area/admin_users_test.rb +++ b/test/integration/admin_area/admin_users_test.rb @@ -73,11 +73,11 @@ class AdminAreaAdminUsersIntegrationTest < JavaScriptApplicationSystemTestCase fill_in 'Username', with: 'test_user_name' # If valid=true creating valid user, if else, then with invalid data if valid - fill_in 'Password', with: 'test_password' - fill_in 'Password confirmation', with: 'test_password' + fill_in 'Password', with: 'test_password' + fill_in 'Password confirmation', with: 'test_password' else - fill_in 'Password', with: 'test_password' - fill_in 'Password confirmation', with: 'test_password2' + fill_in 'Password', with: 'test_password' + fill_in 'Password confirmation', with: 'test_password2' end fill_in 'Identity code', with: '38903110313' fill_in 'Email', with: 'oleg@tester.ee' @@ -93,9 +93,9 @@ class AdminAreaAdminUsersIntegrationTest < JavaScriptApplicationSystemTestCase click_on 'Save' if valid - assert_text 'Record created' + assert_text 'Record created' else - assert_text 'Failed to create record' + assert_text 'Failed to create record' end end end diff --git a/test/integration/admin_area/white_ips_test.rb b/test/integration/admin_area/white_ips_test.rb index b4ffda90a..499c86f57 100644 --- a/test/integration/admin_area/white_ips_test.rb +++ b/test/integration/admin_area/white_ips_test.rb @@ -3,92 +3,92 @@ require 'application_system_test_case' class AdminAreaWhiteIpsIntegrationTest < JavaScriptApplicationSystemTestCase - setup do - WebMock.allow_net_connect! - sign_in users(:admin) + setup do + WebMock.allow_net_connect! + sign_in users(:admin) - @registrar = registrars(:bestnames) - @white_ip = white_ips(:one) - end + @registrar = registrars(:bestnames) + @white_ip = white_ips(:one) + end - def test_visit_new_whitelisted_ip_page - visit_new_whitelisted_ip_page - end + def test_visit_new_whitelisted_ip_page + visit_new_whitelisted_ip_page + end - def test_create_new_whitelisted_ip - visit_new_whitelisted_ip_page - fill_in 'IPv4', with: "127.0.0.1" - fill_in 'IPv6', with: "::ffff:192.0.2.1" + def test_create_new_whitelisted_ip + visit_new_whitelisted_ip_page + fill_in 'IPv4', with: "127.0.0.1" + fill_in 'IPv6', with: "::ffff:192.0.2.1" - find(:css, "#white_ip_interfaces_api").set(true) - find(:css, "#white_ip_interfaces_registrar").set(true) + find(:css, "#white_ip_interfaces_api").set(true) + find(:css, "#white_ip_interfaces_registrar").set(true) - click_on 'Save' + click_on 'Save' - assert_text 'Record created' - end + assert_text 'Record created' + end - def test_failed_to_create_new_whitelisted_ip - visit_new_whitelisted_ip_page - fill_in 'IPv4', with: "asdadadad.asd" + def test_failed_to_create_new_whitelisted_ip + visit_new_whitelisted_ip_page + fill_in 'IPv4', with: "asdadadad.asd" - click_on 'Save' + click_on 'Save' - assert_text 'Failed to create record' - end + assert_text 'Failed to create record' + end - def test_visit_edit_whitelisted_ip_page - visit_edit_whitelisted_ip_page - end + def test_visit_edit_whitelisted_ip_page + visit_edit_whitelisted_ip_page + end - def test_update_whitelisted_ip - visit_info_whitelisted_ip_page - click_on 'Edit' + def test_update_whitelisted_ip + visit_info_whitelisted_ip_page + click_on 'Edit' - fill_in 'IPv4', with: "127.0.0.2" - find(:css, "#white_ip_interfaces_api").set(false) - click_on 'Save' + fill_in 'IPv4', with: "127.0.0.2" + find(:css, "#white_ip_interfaces_api").set(false) + click_on 'Save' - assert_text 'Record updated' - end + assert_text 'Record updated' + end - def test_failed_to_update_whitelisted_ip - visit_info_whitelisted_ip_page - click_on 'Edit' - fill_in 'IPv4', with: "asdadad#" + def test_failed_to_update_whitelisted_ip + visit_info_whitelisted_ip_page + click_on 'Edit' + fill_in 'IPv4', with: "asdadad#" - click_on 'Save' + click_on 'Save' - assert_text 'Failed to update record' - end + assert_text 'Failed to update record' + end - def test_visit_info_whitelisted_ip_page - visit_info_whitelisted_ip_page - end + def test_visit_info_whitelisted_ip_page + visit_info_whitelisted_ip_page + end - def test_delete_whitelisted_ip - visit_info_whitelisted_ip_page - click_on 'Delete' + def test_delete_whitelisted_ip + visit_info_whitelisted_ip_page + click_on 'Delete' - page.driver.browser.switch_to.alert.accept + page.driver.browser.switch_to.alert.accept - assert_text 'Record deleted' - end + assert_text 'Record deleted' + end - private + private - def visit_new_whitelisted_ip_page - visit new_admin_registrar_white_ip_path(registrar_id: @registrar.id) - assert_text 'New whitelisted IP' - end + def visit_new_whitelisted_ip_page + visit new_admin_registrar_white_ip_path(registrar_id: @registrar.id) + assert_text 'New whitelisted IP' + end - def visit_edit_whitelisted_ip_page - visit edit_admin_registrar_white_ip_path(registrar_id: @registrar.id, id: @white_ip.id) - assert_text 'Edit white IP' - end + def visit_edit_whitelisted_ip_page + visit edit_admin_registrar_white_ip_path(registrar_id: @registrar.id, id: @white_ip.id) + assert_text 'Edit white IP' + end - def visit_info_whitelisted_ip_page - visit admin_registrar_white_ip_path(registrar_id: @registrar.id, id: @white_ip.id) - assert_text 'White IP' - end + def visit_info_whitelisted_ip_page + visit admin_registrar_white_ip_path(registrar_id: @registrar.id, id: @white_ip.id) + assert_text 'White IP' + end end