changed tabs

test/integration/admin_area/admin_users_test.rb

@@ -2,103 +2,100 @@ require 'test_helper'
 require 'application_system_test_case'
 
 class AdminAreaAdminUsersIntegrationTest < JavaScriptApplicationSystemTestCase
-    include Devise::Test::IntegrationHelpers
-    include ActionView::Helpers::NumberHelper
+  include Devise::Test::IntegrationHelpers
+  include ActionView::Helpers::NumberHelper
 
-    setup do
-        WebMock.allow_net_connect!
-        @original_default_language = Setting.default_language
-        sign_in users(:admin)
-    end
+  setup do
+    WebMock.allow_net_connect!
+    @original_default_language = Setting.default_language
+    sign_in users(:admin)
+  end
 
-    # Helpers funcs
-    def createNewAdminUser(valid)
-        visit admin_admin_users_path
-        click_on 'New admin user'
+  def test_create_new_admin_user
+    createNewAdminUser(true)
+  end
 
-        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'
-        else
-            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'
+  def test_create_with_invalid_data_new_admin_user
+    createNewAdminUser(false)
+  end
 
-        select 'Estonia', from: 'admin_user_country_code', match: :first
+  def test_edit_successfully_exist_record
+    createNewAdminUser(true)
 
-        select_element = find(:xpath, "/html/body/div[2]/form/div[2]/div/div[7]/div[2]/div/div[1]")
-        select_element.click
+    visit admin_admin_users_path
+    click_on 'test_user_name'
 
-        option_element = find(:xpath, "/html/body/div[2]/form/div[2]/div/div[7]/div[2]/div/div[2]/div/div[1]")
-        option_element.click
+    assert_text 'General'
+    click_on 'Edit'
 
-        click_on 'Save'
+    fill_in 'Password', with: 'test_password'
+    fill_in 'Password confirmation', with: 'test_password'
 
-        if valid
-            assert_text 'Record created'
-        else
-            assert_text 'Failed to create record'
-        end
-    end
+    click_on 'Save'
+    assert_text 'Record updated'
+  end
 
-    # Tests
-    # "/admin/admin_users"
-    def test_create_new_admin_user
-        createNewAdminUser(true)
-    end
+  def test_edit_exist_record_with_invalid_data
+    createNewAdminUser(true)
 
-    def test_create_with_invalid_data_new_admin_user
-        createNewAdminUser(false)
-    end
+    visit admin_admin_users_path
+    click_on 'test_user_name'
 
-    def test_edit_successfully_exist_record
-        createNewAdminUser(true)
+    assert_text 'General'
+    click_on 'Edit'
 
-        visit admin_admin_users_path
-        click_on 'test_user_name'
+    fill_in 'Password', with: 'test_password'
+    fill_in 'Password confirmation', with: 'test_password2'
 
-        assert_text 'General'
-        click_on 'Edit'
+    click_on 'Save'
+    assert_text 'Failed to update record'
+  end
 
+  def test_delete_exist_record
+    createNewAdminUser(true)
+
+    visit admin_admin_users_path
+    click_on 'test_user_name'
+    assert_text 'General'
+    click_on 'Delete'
+
+    page.driver.browser.switch_to.alert.accept
+
+    assert_text 'Record deleted'
+  end
+
+  private
+
+  def createNewAdminUser(valid)
+    visit admin_admin_users_path
+    click_on 'New admin user'
+
+    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'
-
-        click_on 'Save'
-        assert_text 'Record updated'
-    end
-
-    def test_edit_exist_record_with_invalid_data
-        createNewAdminUser(true)
-
-        visit admin_admin_users_path
-        click_on 'test_user_name'
-
-        assert_text 'General'
-        click_on 'Edit'
-
+    else
         fill_in 'Password', with: 'test_password'
         fill_in 'Password confirmation', with: 'test_password2'
-
-        click_on 'Save'
-        assert_text 'Failed to update record'
     end
+    fill_in 'Identity code', with: '38903110313'
+    fill_in 'Email', with: 'oleg@tester.ee'
 
-    def test_delete_exist_record
-        createNewAdminUser(true)
+    select 'Estonia', from: 'admin_user_country_code', match: :first
 
-        visit admin_admin_users_path
-        click_on 'test_user_name'
+    select_element = find(:xpath, "/html/body/div[2]/form/div[2]/div/div[7]/div[2]/div/div[1]")
+    select_element.click
 
-        assert_text 'General'
-        click_on 'Delete'
+    option_element = find(:xpath, "/html/body/div[2]/form/div[2]/div/div[7]/div[2]/div/div[2]/div/div[1]")
+    option_element.click
 
-        # Accept to delete in modal window
-        page.driver.browser.switch_to.alert.accept
+    click_on 'Save'
 
-        assert_text 'Record deleted'
+    if valid
+        assert_text 'Record created'
+    else
+        assert_text 'Failed to create record'
     end
+  end
 end