diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/Cobrand.t | 12 | ||||
| -rw-r--r-- | t/Cobrands/Mysite/Util.pm | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/t/Cobrand.t b/t/Cobrand.t index 1f3321b0d..3a397a897 100755 --- a/t/Cobrand.t +++ b/t/Cobrand.t @@ -213,17 +213,6 @@ sub test_url { is($url, '/xyz', 'url returns passed url if there is no url function defined by the cobrand'); } -sub test_show_watermark { - my $cobrand = 'mysite'; - my $watermark = Cobrand::show_watermark($cobrand); - is($watermark, 0, 'show_watermark returns output from cobrand module'); - - $cobrand = 'nosite'; - $watermark = Cobrand::show_watermark($cobrand); - is($watermark, 1, 'watermark returns 1 if there is no show_watermark function defined by the cobrand'); - -} - sub test_allow_photo_upload { my $cobrand = 'mysite'; my $photo_upload = Cobrand::allow_photo_upload($cobrand); @@ -287,7 +276,6 @@ ok(test_root_path_js() == 1, 'Ran all tests for root_js'); ok(test_site_title() == 1, 'Ran all tests for site_title'); ok(test_on_map_list_limit() == 1, 'Ran all tests for on_map_list_limit'); ok(test_url() == 1, 'Ran all tests for url'); -ok(test_show_watermark() == 1, 'Ran all tests for show_watermark'); ok(test_allow_photo_upload() == 1, 'Ran all tests for allow_photo_upload'); ok(test_allow_photo_display() == 1, 'Ran all tests for allow_photo_display'); ok(test_council_check() == 1, 'Ran all tests for council_check'); diff --git a/t/Cobrands/Mysite/Util.pm b/t/Cobrands/Mysite/Util.pm index 8aedd2c8c..c1a8023c1 100644 --- a/t/Cobrands/Mysite/Util.pm +++ b/t/Cobrands/Mysite/Util.pm @@ -87,10 +87,6 @@ sub url { return '/transformed_url'; } -sub show_watermark { - return 0; -} - sub allow_photo_upload { return 0; } |