Merge branch 'master' into add-contacts-email-constraint

# Conflicts:
#	db/structure.sql

test/system/admin_area/api_users/new_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class AdminAreaNewApiUserTest < ApplicationSystemTestCase
+  setup do
+    sign_in users(:admin)
+  end
+
+  def test_new_api_user_creation_with_required_params
+    visit admin_api_users_url
+    click_link_or_button 'New API user'
+
+    fill_in 'Username', with: 'newtest'
+    fill_in 'Password', with: 'testtest'
+    find('#api_user_registrar_id', visible: false).set(registrars(:bestnames).id)
+
+    assert_difference 'ApiUser.count' do
+      click_link_or_button 'Save'
+    end
+
+    assert_current_path admin_api_user_path(ApiUser.last)
+    assert_text 'Record created'
+    assert_text 'Username newtest'
+    assert_text 'Password testtest'
+  end
+end

test/system/admin_area/domains/force_delete_test.rb

@@ -44,8 +44,7 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
   end
 
   def test_cancels_scheduled_domain_force_delete
-    @domain.update_attribute(:statuses, [DomainStatus::FORCE_DELETE])
-    assert @domain.force_delete_scheduled?
+    @domain.schedule_force_delete
 
     visit edit_admin_domain_url(@domain)
     click_link_or_button 'Cancel force delete'
@@ -55,4 +54,12 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     assert_current_path edit_admin_domain_path(@domain)
     assert_text 'Force delete procedure has been cancelled'
   end
-end
+
+  def test_force_delete_procedure_cannot_be_scheduled_on_a_discarded_domain
+    @domain.discard
+
+    visit edit_admin_domain_url(@domain)
+    assert_no_button 'Schedule force delete'
+    assert_no_link 'Schedule force delete'
+  end
+end

test/system/admin_area/protected_area_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+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'
+    assert_current_path new_admin_user_session_path
+  end
+
+  def test_authenticated_user_can_access_protected_area
+    sign_in users(:admin)
+    visit admin_domains_url
+    assert_current_path admin_domains_path
+  end
+
+  def test_authenticated_user_is_not_asked_to_authenticate_again
+    sign_in users(:admin)
+    visit new_admin_user_session_url
+    assert_text 'You are already signed in'
+    assert_current_path admin_domains_path
+  end
+end

test/system/admin_area/sign_in_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class AdminAreaSignInTest < ApplicationSystemTestCase
+  setup do
+    @user = users(:admin)
+  end
+
+  def test_correct_username_and_password
+    visit new_admin_user_session_url
+    fill_in 'admin_user_username', with: @user.username
+    fill_in 'admin_user_password', with: 'testtest'
+    click_button 'Sign in'
+
+    assert_text 'Signed in successfully'
+    assert_current_path admin_domains_path
+  end
+
+  def test_wrong_password
+    visit new_admin_user_session_url
+    fill_in 'admin_user_username', with: @user.username
+    fill_in 'admin_user_password', with: 'wrong'
+    click_button 'Sign in'
+
+    assert_text 'Invalid Username or password'
+    assert_current_path new_admin_user_session_path
+  end
+
+  def test_retry_with_correct_username_and_password
+    visit new_admin_user_session_url
+    fill_in 'admin_user_username', with: @user.username
+    fill_in 'admin_user_password', with: 'wrong'
+    click_button 'Sign in'
+
+    assert_text 'Invalid Username or password'
+    assert_current_path new_admin_user_session_path
+
+    fill_in 'admin_user_username', with: @user.username
+    fill_in 'admin_user_password', with: 'testtest'
+    click_button 'Sign in'
+
+    assert_text 'Signed in successfully'
+    assert_current_path admin_domains_path
+  end
+end

test/system/admin_area/sign_out_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class AdminAreaSignOutTest < ApplicationSystemTestCase
+  setup do
+    sign_in users(:admin)
+  end
+
+  def test_logout
+    visit admin_root_url
+    click_on 'Sign out'
+
+    assert_text 'Signed out successfully'
+    assert_current_path new_admin_user_session_path
+  end
+end