diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 7 | ||||
| -rw-r--r-- | t/app/controller/admin/defecttypes.t | 11 | ||||
| -rw-r--r-- | t/app/controller/admin/permissions.t | 8 | ||||
| -rw-r--r-- | t/app/controller/my_planned.t | 8 |
4 files changed, 0 insertions, 34 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 6f6284c7a..db6d120ed 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -193,13 +193,6 @@ sub available_permissions { my $perms = $self->next::method(); $perms->{Bodies}->{defect_type_edit} = "Add/edit defect types"; - delete $perms->{Problems}->{report_edit}; - delete $perms->{Problems}->{report_edit_category}; - delete $perms->{Problems}->{report_edit_priority}; - delete $perms->{Problems}->{report_inspect}; - delete $perms->{Problems}->{report_instruct}; - delete $perms->{Problems}->{planned_reports}; - return $perms; } diff --git a/t/app/controller/admin/defecttypes.t b/t/app/controller/admin/defecttypes.t index 8589062db..15fdac2f8 100644 --- a/t/app/controller/admin/defecttypes.t +++ b/t/app/controller/admin/defecttypes.t @@ -1,5 +1,4 @@ use FixMyStreet::TestMech; -use Test::MockModule; my $mech = FixMyStreet::TestMech->new; @@ -27,16 +26,6 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => ['bromley'], }, sub { FixMyStreet::override_config { ALLOWED_COBRANDS => ['oxfordshire'], }, sub { - my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::Oxfordshire'); - $cobrand->mock('available_permissions', sub { - my $self = shift; - - my $perms = FixMyStreet::Cobrand::Default->available_permissions; - $perms->{Bodies}->{defect_type_edit} = "Add/edit defect types"; - - return $perms; - }); - my $body = $mech->create_body_ok( 2237, 'Oxfordshire County Council' ); subtest 'check defect types menu available to superusers' => sub { diff --git a/t/app/controller/admin/permissions.t b/t/app/controller/admin/permissions.t index ff5a8ec4f..b7bffaaa5 100644 --- a/t/app/controller/admin/permissions.t +++ b/t/app/controller/admin/permissions.t @@ -1,5 +1,4 @@ use FixMyStreet::TestMech; -use Test::MockModule; my $mech = FixMyStreet::TestMech->new; @@ -29,13 +28,6 @@ ok $report, "created test report - $report_id"; $mech->log_in_ok( $oxfordshireuser->email ); -my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::Oxfordshire'); -$cobrand->mock('available_permissions', sub { - my $self = shift; - - return FixMyStreet::Cobrand::Default->available_permissions; -}); - subtest "Users can't edit report without report_edit permission" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'oxfordshire' ], diff --git a/t/app/controller/my_planned.t b/t/app/controller/my_planned.t index a6a47a798..67d59e148 100644 --- a/t/app/controller/my_planned.t +++ b/t/app/controller/my_planned.t @@ -1,5 +1,4 @@ use FixMyStreet::TestMech; -use Test::MockModule; my $mech = FixMyStreet::TestMech->new; $mech->get_ok('/my/planned'); @@ -188,13 +187,6 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'oxfordshire' ], BASE_URL => 'http://oxfordshire.fixmystreet.site', }, sub { - my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::Oxfordshire'); - $cobrand->mock('available_permissions', sub { - my $self = shift; - - return FixMyStreet::Cobrand::Default->available_permissions; - }); - subtest "can remove problems not displayed in cobrand from shortlist" => sub { $user->user_planned_reports->remove(); my ($problem1) = $mech->create_problems_for_body(2, $body->id, 'New Problem'); |