Merge pull request #528 from alphagov/fix-domain-list-hints

Clarify hints for domain lists

Author: alanth

app/views/admin/rate_limits/edit.html.erb

@@ -44,7 +44,7 @@
         <%= form_row for: [form.object, :domain_whitelist] do %>
           <%= error_messages_for_field @rate_limit, :domain_whitelist %>
           <%= form.text_area :domain_whitelist, tabindex: increment, rows: 15, class: 'form-control' %>
-          <p><small>use *.example.com or **.example.com for wildcard matching</small><p>
+          <p><small>use *.example.com to match one subdomain and **.example.com to match nested subdomains</small><p>
         <% end %>
 
       <% elsif params[:tab] == "domain_blacklist" %>
@@ -53,7 +53,7 @@
         <%= form_row for: [form.object, :domain_blacklist] do %>
           <%= error_messages_for_field @rate_limit, :domain_blacklist %>
           <%= form.text_area :domain_blacklist, tabindex: increment, rows: 15, class: 'form-control' %>
-          <p><small>use *.example.com or **.example.com for wildcard matching</small><p>
+          <p><small>use *.example.com to match one subdomain and **.example.com to match nested subdomains</small><p>
         <% end %>
 
       <% elsif params[:tab] == "ip_whitelist" %>

features/admin/updating_rate_limits.feature

@@ -23,14 +23,28 @@ Feature: Sysadmin updates the rate limits
     And I follow "Rate Limits"
     Then I should see "Edit Rate Limits"
     When I follow "Domain Whitelist"
-    Then I should see "use *.example.com or **.example.com for wildcard matching"
+    Then I should see "use *.example.com to match one subdomain and **.example.com to match nested subdomains"
     When I fill in "rate_limit_domain_whitelist" with "foo("
     And I press "Save"
     Then I should see "Domain whitelist is invalid"
     When I fill in "rate_limit_domain_whitelist" with "example.com"
     And I press "Save"
     Then I should see "Rate limits updated successfully"
 
+  Scenario: Sysadmin updates the domain blacklist
+    When I am logged in as a sysadmin
+    And I am on the admin home page
+    And I follow "Rate Limits"
+    Then I should see "Edit Rate Limits"
+    When I follow "Domain Blacklist"
+    Then I should see "use *.example.com to match one subdomain and **.example.com to match nested subdomains"
+    When I fill in "rate_limit_domain_blacklist" with "foo("
+    And I press "Save"
+    Then I should see "Domain blacklist is invalid"
+    When I fill in "rate_limit_domain_blacklist" with "example.com"
+    And I press "Save"
+    Then I should see "Rate limits updated successfully"
+
   Scenario: Sysadmin updates the IP whitelist
     When I am logged in as a sysadmin
     And I am on the admin home page
@@ -44,3 +58,17 @@ Feature: Sysadmin updates the rate limits
     When I fill in "rate_limit_ip_whitelist" with "127.0.0.1/32"
     And I press "Save"
     Then I should see "Rate limits updated successfully"
+
+  Scenario: Sysadmin updates the IP whitelist
+    When I am logged in as a sysadmin
+    And I am on the admin home page
+    And I follow "Rate Limits"
+    Then I should see "Edit Rate Limits"
+    When I follow "IP Blacklist"
+    Then I should see "use CIDR addressing to match ranges, e.g. 192.168.0.0/24"
+    When I fill in "rate_limit_ip_blacklist" with "127"
+    And I press "Save"
+    Then I should see "IP blacklist is invalid"
+    When I fill in "rate_limit_ip_blacklist" with "127.0.0.1/32"
+    And I press "Save"
+    Then I should see "Rate limits updated successfully"