diff options
author | Matthew Somerville <matthew@mysociety.org> | 2012-12-10 16:28:52 +0000 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2012-12-15 00:11:05 +0000 |
commit | f82abb282f60191ee530c552bf025e509e2a57e8 (patch) | |
tree | 009ec8c702c77e5cd4e0b6a48542eee82538d4f5 /t | |
parent | 9486610ef67f031d80e70ec3cf1fea330858abd5 (diff) |
Rename 'open311conf' database table to 'body'.
Diffstat (limited to 't')
-rw-r--r-- | t/app/controller/admin.t | 6 | ||||
-rw-r--r-- | t/app/controller/report_new_open311.t | 2 | ||||
-rw-r--r-- | t/cobrand/get_council_sender.t | 2 | ||||
-rw-r--r-- | t/open311/populate-service-list.t | 18 |
4 files changed, 14 insertions, 14 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 9ec15ec21..43684a206 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -236,7 +236,7 @@ subtest 'check contact updating' => sub { }; my $open311 = - FixMyStreet::App->model('DB::Open311Conf')->search( { area_id => 2650 } ); + FixMyStreet::App->model('DB::Body')->search( { area_id => 2650 } ); $open311->delete if $open311; subtest 'check open311 configuring' => sub { @@ -259,7 +259,7 @@ subtest 'check open311 configuring' => sub { $mech->content_contains('Configuration updated - contacts will be generated automatically later'); $open311 = - FixMyStreet::App->model('DB::Open311Conf')->search( { area_id => 2650 } ); + FixMyStreet::App->model('DB::Body')->search( { area_id => 2650 } ); is $open311->count, 1, 'only one configuration'; my $conf = $open311->first; @@ -283,7 +283,7 @@ subtest 'check open311 configuring' => sub { $mech->content_contains('Configuration updated'); $open311 = - FixMyStreet::App->model('DB::Open311Conf')->search( { area_id => 2650 } ); + FixMyStreet::App->model('DB::Body')->search( { area_id => 2650 } ); is $open311->count, 1, 'only one configuration'; $conf = $open311->first; diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t index 55c5a92e8..4b009c746 100644 --- a/t/app/controller/report_new_open311.t +++ b/t/app/controller/report_new_open311.t @@ -7,7 +7,7 @@ use Web::Scraper; my $mech = FixMyStreet::TestMech->new; -my $open311Conf = FixMyStreet::App->model('DB::Open311Conf')->find_or_create( { +FixMyStreet::App->model('DB::Body')->find_or_create( { area_id => 2651, endpoint => 'http://example.com/open311', jurisdiction => 'mySociety', diff --git a/t/cobrand/get_council_sender.t b/t/cobrand/get_council_sender.t index e61f36370..c05864d8a 100644 --- a/t/cobrand/get_council_sender.t +++ b/t/cobrand/get_council_sender.t @@ -16,7 +16,7 @@ my $c = FixMyStreet::Cobrand::FixMyStreet->new(); is_deeply $c->get_council_sender( '1000', { type => 'DIS' } ), { method => 'Email' }, 'defaults to email'; is_deeply $c->get_council_sender( '1000', { type => 'LBO' } ), { method=> 'London' }, 'returns london report it if London borough'; -my $conf = FixMyStreet::App->model('DB::Open311Conf')->find_or_create( +my $conf = FixMyStreet::App->model('DB::Body')->find_or_create( area_id => 1000, endpoint => '', send_method => 'TestMethod' diff --git a/t/open311/populate-service-list.t b/t/open311/populate-service-list.t index 00026cd9f..8c23e6465 100644 --- a/t/open311/populate-service-list.t +++ b/t/open311/populate-service-list.t @@ -24,7 +24,7 @@ subtest 'check basic functionality' => sub { my $service_list = get_xml_simple_object( get_standard_xml() ); - my $council = FixMyStreet::App->model('DB::Open311Conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -54,7 +54,7 @@ subtest 'check non open311 contacts marked as deleted' => sub { my $service_list = get_xml_simple_object( get_standard_xml() ); - my $council = FixMyStreet::App->model('DB::Open311Conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -89,7 +89,7 @@ subtest 'check email changed if matching category' => sub { my $service_list = get_xml_simple_object( get_standard_xml() ); - my $council = FixMyStreet::App->model('DB::Open311Conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -126,7 +126,7 @@ subtest 'check category name changed if updated' => sub { my $service_list = get_xml_simple_object( get_standard_xml() ); - my $council = FixMyStreet::App->model('DB::Open311Conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -179,7 +179,7 @@ subtest 'check conflicting contacts not changed' => sub { my $service_list = get_xml_simple_object( get_standard_xml() ); - my $council = FixMyStreet::App->model('DB::Open311Conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -243,7 +243,7 @@ subtest 'check meta data population' => sub { test_get_returns => { 'services/100.xml' => $meta_xml } ); - my $council = FixMyStreet::App->model('DB::Open311conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 2482 } ); @@ -432,7 +432,7 @@ for my $test ( my $service_list = get_xml_simple_object( $services_xml ); $service_list = { service => [ $service_list->{ service } ] }; - my $council = FixMyStreet::App->model('DB::Open311conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -505,7 +505,7 @@ subtest 'check attribute ordering' => sub { test_get_returns => { 'services/100.xml' => $meta_xml } ); - my $council = FixMyStreet::App->model('DB::Open311conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 1 } ); @@ -611,7 +611,7 @@ subtest 'check bromely skip code' => sub { test_get_returns => { 'services/100.xml' => $meta_xml } ); - my $council = FixMyStreet::App->model('DB::Open311conf')->new( { + my $council = FixMyStreet::App->model('DB::Body')->new( { area_id => 2482 } ); |