Add revoke all blocks page title

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index bf61f906b30de4f9a640d8bb18cae40b12ea1d3b..a671f0d16f67112eb3dcf508a3fc585f16b2493e 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -8,7 +8,7 @@ class UserBlocksController < ApplicationController
 
   authorize_resource
 
 
   authorize_resource
 

-  before_action :lookup_user, :only => [:new, :create, :blocks_on, :blocks_by]
+  before_action :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on, :blocks_by]

   before_action :lookup_user_block, :only => [:show, :edit, :update, :revoke]
   before_action :require_valid_params, :only => [:create, :update]
   before_action :check_database_readable
   before_action :lookup_user_block, :only => [:show, :edit, :update, :revoke]
   before_action :require_valid_params, :only => [:create, :update]
   before_action :check_database_readable

diff --git a/app/views/user_blocks/revoke_all.html.erb b/app/views/user_blocks/revoke_all.html.erb
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..982792dddc6aa506a12b1b3a23097ee6bcbf8fc0 100644 (file)
--- a/app/views/user_blocks/revoke_all.html.erb
+++ b/app/views/user_blocks/revoke_all.html.erb
@@ -0,0 +1,8 @@
+<% @title = t ".title",
+              :block_on => @user.display_name %>
+
+<% content_for :heading do %>
+  <h1><%= t ".heading_html",
+            :block_on => link_to(@user.display_name,
+                                 user_path(@user)) %></h1>
+<% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8bb239ca55ca11f3b939ba205abc3e2914d00606..449b6e54041e63ead7aa31b12bb529593aeaa189 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2893,6 +2893,9 @@ en:
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."

+    revoke_all:
+      title: "Revoking all blocks on %{block_on}"
+      heading_html: "Revoking all blocks on %{block_on}"

     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."

diff --git a/test/system/user_blocks_test.rb b/test/system/user_blocks_test.rb
index e1247d6a40b2d116dbd20addd137fd68e67c89d0..66a8befec2d0b9437b218bb4afc761e1f921aef8 100644 (file)
--- a/test/system/user_blocks_test.rb
+++ b/test/system/user_blocks_test.rb
@@ -27,12 +27,16 @@ class ReportNoteTest < ApplicationSystemTestCase
     assert_no_link "Revoke all blocks"
   end
 
     assert_no_link "Revoke all blocks"
   end
 

-  test "revoke all link is present for moderators when viewed user has active blocks" do
+  test "revoke all link is present and working for moderators when viewed user has active blocks" do

     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)
     sign_in_as(create(:moderator_user))
 
     visit user_path(blocked_user)
     assert_link "Revoke all blocks"
     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)
     sign_in_as(create(:moderator_user))
 
     visit user_path(blocked_user)
     assert_link "Revoke all blocks"

+
+    click_link "Revoke all blocks"
+    assert_title "Revoking all blocks on #{blocked_user.display_name}"
+    assert_text "Revoking all blocks on #{blocked_user.display_name}"

   end
 end
   end
 end