diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-12-02 17:45:03 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-12-02 17:45:03 +0000 |
| commit | b6fcd966d204d35c149b2bff91513e732f3101c8 (patch) | |
| tree | 75fb01b3910fc4093584bb3b9056e9ea6dbe0eba /t/app/controller | |
| parent | 8543192128ed15c9bc73e3686ab03324ee5e2b11 (diff) | |
| parent | 7b20745945638cce030879eafc8cac8f8bd81c56 (diff) | |
Merge branch 'reduce-fixmystreet-app'
Diffstat (limited to 't/app/controller')
| -rw-r--r-- | t/app/controller/admin.t | 4 | ||||
| -rw-r--r-- | t/app/controller/rss.t | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index e2dd5df19..96565e82b 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -1240,9 +1240,7 @@ subtest "Check admin_base_url" => sub { my $rs = FixMyStreet::App->model('DB::Problem'); my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($report->cobrand)->new(); - is (FixMyStreet::App->model('DB::Problem')->get_admin_url( - $cobrand, - $report), + is ($report->admin_url($cobrand), (sprintf 'https://secure.mysociety.org/admin/bci/report_edit/%d', $report_id), 'get_admin_url OK'); }; diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t index db653c094..3e820cff3 100644 --- a/t/app/controller/rss.t +++ b/t/app/controller/rss.t @@ -181,7 +181,7 @@ my $report_to_county_council = FixMyStreet::App->model('DB::Problem')->find_or_c subtest "check RSS feeds on cobrand have correct URLs for non-cobrand reports" => sub { $mech->host('hart.fixmystreet.com'); - my $expected1 = mySociety::Config::get('BASE_URL') . '/report/' . $report_to_county_council->id; + my $expected1 = FixMyStreet->config('BASE_URL') . '/report/' . $report_to_county_council->id; my $expected2; FixMyStreet::override_config { |