From cb02a3b83beba71be672795bac8f90c61c1156f4 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 8 Oct 2014 16:20:47 +0100
Subject: Prevent overhang of admin body categories table.

Group things together more simply. Fixes #738.
---
 t/app/controller/admin.t | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 't/app/controller/admin.t')

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index 2cc88ccc3..1757e386f 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -181,9 +181,9 @@ subtest 'check contact creation' => sub {
     } } );
 
     $mech->content_contains( 'test category' );
-    $mech->content_contains( '<td>test@example.com' );
+    $mech->content_contains( 'test@example.com' );
     $mech->content_contains( '<td>test note' );
-    $mech->content_contains( '<td>Public' );
+    $mech->content_contains( 'Private:&nbsp;No' );
 
     $mech->submit_form_ok( { with_fields => { 
         category   => 'private category',
@@ -193,7 +193,7 @@ subtest 'check contact creation' => sub {
     } } );
 
     $mech->content_contains( 'private category' );
-    $mech->content_contains( '<td>Non Public' );
+    $mech->content_contains( 'Private:&nbsp;Yes' );
 
     $mech->submit_form_ok( { with_fields => {
         category => 'test/category',
@@ -215,9 +215,9 @@ subtest 'check contact editing' => sub {
     } } );
 
     $mech->content_contains( 'test category' );
-    $mech->content_contains( '<td>test2@example.com' );
+    $mech->content_contains( 'test2@example.com' );
     $mech->content_contains( '<td>test2 note' );
-    $mech->content_contains( '<td>Public' );
+    $mech->content_contains( 'Private:&nbsp;No' );
 
     $mech->get_ok('/admin/body_edit/2650/test%20category');
     $mech->submit_form_ok( { with_fields => { 
@@ -226,7 +226,7 @@ subtest 'check contact editing' => sub {
         non_public => 'on',
     } } );
 
-    $mech->content_contains( '<td>Non Public' );
+    $mech->content_contains( 'Private:&nbsp;Yes' );
 
     $mech->get_ok('/admin/body_edit/2650/test%20category');
     $mech->content_contains( '<td><strong>test2@example.com' );
@@ -242,7 +242,7 @@ subtest 'check contact updating' => sub {
     $mech->tick( 'confirmed', 'test category' );
     $mech->submit_form_ok({form_number => 1});
 
-    $mech->content_like(qr'test2@example.com</td>[^<]*<td>Yes's);
+    $mech->content_like(qr'test2@example.com</td>[^<]*<td>\s*Confirmed:&nbsp;Yes's);
     $mech->get_ok('/admin/body_edit/2650/test%20category');
     $mech->content_like(qr{test2\@example.com[^<]*</td>[^<]*<td><strong>Yes}s);
 };
-- 
cgit v1.2.3