From d7f41756f9f8b61223b8bd04e7cadb34342dd4a1 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Nov 2018 12:09:46 +0100
Subject: [PATCH 1/3] Check that a request that requires authentication is
 redirected when the user hasn't seen the terms

---
 test/controllers/users_controller_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 20a04e90b..57dddc258 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -671,6 +671,17 @@ class UsersControllerTest < ActionController::TestCase
     assert_equal true, user.terms_seen
   end
 
+  # Check that if you haven't seen the terms, and make a request that requires authentication,
+  # that your request is redirected to view the terms
+  def test_terms_not_seen_redirection
+    user = create(:user, :terms_seen => false)
+    session[:user] = user.id
+
+    get :account, :params => { :display_name => user.display_name }
+    assert_response :redirect
+    assert_redirected_to :action => :terms, :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
+  end
+
   def test_go_public
     user = create(:user, :data_public => false)
     post :go_public, :session => { :user => user }

From 0d55c40ca8c4c338a606d97432e53af4e802a3cf Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Nov 2018 12:18:53 +0100
Subject: [PATCH 2/3] Ensure that the blocked template rendering works

---
 test/controllers/users_controller_test.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 57dddc258..7eda2a53a 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -323,6 +323,22 @@ class UsersControllerTest < ActionController::TestCase
     assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
   end
 
+  def test_new_blocked_domain
+    user = build(:user, :pending, :email => "user@example.net")
+    create(:acl, :domain => "example.net", :k => "no_account_creation")
+
+    assert_no_difference "User.count" do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
+          post :save, :session => { :new_user => user }
+        end
+      end
+    end
+
+    assert_response :success
+    assert_template "blocked"
+  end
+
   def test_save_referer_params
     user = build(:user, :pending)
 

From c89b88c8d0d9c42283cd404228f5079b93ff5a35 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Nov 2018 12:25:21 +0100
Subject: [PATCH 3/3] Add a changeset to exercise that part of the contact
 rendering

---
 test/controllers/users_controller_test.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 7eda2a53a..deb736a7b 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1005,6 +1005,8 @@ class UsersControllerTest < ActionController::TestCase
     user = create(:user, :home_lon => 1.1, :home_lat => 1.1)
     friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2)
     create(:friend, :befriender => user, :befriendee => friend_user)
+    create(:changeset, :user => friend_user)
+
     get :show, :params => { :display_name => user.display_name }
     assert_response :success
     assert_select "div#userinformation" do