diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | t/app/controller/report_new.t | 2 | ||||
| -rw-r--r-- | t/app/controller/reports.t | 1 | ||||
| -rw-r--r-- | t/app/model/problem.t | 3 | ||||
| -rw-r--r-- | t/cobrand/get_body_sender.t | 2 | ||||
| -rw-r--r-- | t/cobrand/oxfordshire.t | 1 | ||||
| -rw-r--r-- | t/open311/getupdates.t | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 7b0ae64ab..1e848dbef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,15 @@ env: - secure: "llgWNfR/8pH0HjYpg+xhVxuqTaLC0GGUugfuINiUap7JxzjCZ2rlryxCXA4BCM8GUHa9wlYKhrKCSx+DM3EHRE0cLei7LNxAK1JSXLj3NihFQhqnq64tjDwGCSA4l7mlqErA7DK4Dpmh+hBp5f680akITAInM92CbwQZxLDYaCU=" - secure: "qW+WCgAF68itADxcbcq+nCnKx3vf3GX73HMfjfbkFFUsYmIR+ZaJ9yQMnGJwxIpCHTWLAeqyx4KO8N8T3GmNdKYzIMZemOzp4ED29YC31QOQeq1CwNp2hD5sq/o47d2BzXWwMYNvNXfxz1K6r2c6EMPUtu8X3B8ExZq1RzSFdXs=" -before_install: - - sudo apt-get -qq update - - sudo apt-get install gettext - - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8 de_CH.UTF-8 sv_SE.UTF-8 +sudo: false + +addons: + apt: + packages: + - gettext + - language-pack-de + - language-pack-nb + install: - .travis/install before_script: diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index f3bee0513..33324d210 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -1639,7 +1639,7 @@ subtest "inspectors get redirected directly to the report page" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], BASE_URL => 'https://www.fixmystreet.com', - MAPIT_URL => 'http://mapit.mysociety.org/', + MAPIT_URL => 'http://mapit.uk/', }, sub { $mech->log_out_ok; diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t index a21d3ad65..56b4cce8c 100644 --- a/t/app/controller/reports.t +++ b/t/app/controller/reports.t @@ -199,7 +199,6 @@ is $stats->{'Westminster City Council'}->[1], 5, 'non public reports included in subtest "test fiksgatami all reports page" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'fiksgatami' ], - MAPIT_URL => 'http://mapit.nuug.no/', }, sub { $mech->create_body_ok(3, 'Oslo'); ok $mech->host("fiksgatami.no"), 'change host to fiksgatami'; diff --git a/t/app/model/problem.t b/t/app/model/problem.t index 6b1be0a76..47f654236 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -531,7 +531,6 @@ foreach my $test ( { my $override = { ALLOWED_COBRANDS => [ 'fixmystreet' ], BASE_URL => 'http://www.fixmystreet.com', - MAPIT_URL => 'http://mapit.mysociety.org/', }; if ( $test->{cobrand} && $test->{cobrand} =~ /hart/ ) { $override->{ALLOWED_COBRANDS} = [ 'hart' ]; @@ -607,8 +606,6 @@ foreach my $test ( { subtest 'check can set mutiple emails as a single contact' => sub { my $override = { ALLOWED_COBRANDS => [ 'fixmystreet' ], - BASE_URL => 'http://www.fixmystreet.com', - MAPIT_URL => 'http://mapit.mysociety.org/', }; my $contact = { diff --git a/t/cobrand/get_body_sender.t b/t/cobrand/get_body_sender.t index fbdfbffa7..b71dece7e 100644 --- a/t/cobrand/get_body_sender.t +++ b/t/cobrand/get_body_sender.t @@ -23,7 +23,7 @@ my $body_area = $body->body_areas->find_or_create({ area_id => 1000 }); FixMyStreet::override_config { MAPIT_TYPES => [ 'LBO' ], - MAPIT_URL => 'http://mapit.mysociety.org/', + MAPIT_URL => 'http://mapit.uk/', # Not actually used as no special casing at present }, sub { is_deeply $c->get_body_sender( $body ), { method => 'Email', contact => undef }, 'defaults to email'; $body_area->update({ area_id => 2481 }); # Croydon LBO diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t index 4849554ea..d5effacae 100644 --- a/t/cobrand/oxfordshire.t +++ b/t/cobrand/oxfordshire.t @@ -32,7 +32,6 @@ subtest 'check /ajax defaults to open reports only' => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { 'oxfordshire' => '.' } ], - MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { my $json = $mech->get_ok_json( '/ajax?status=all&bbox=' . $bbox ); my $pins = $json->{pins}; diff --git a/t/open311/getupdates.t b/t/open311/getupdates.t index 0e31db482..a2ea70c09 100644 --- a/t/open311/getupdates.t +++ b/t/open311/getupdates.t @@ -222,7 +222,7 @@ my $problem3 = $problem_rs->create( { used_map => 1, name => '', state => 'confirmed', - cobrand => 'fixamingata', + cobrand => 'fiksgatami', user => $user, created => DateTime->now()->subtract( days => 1 ), lastupdate => DateTime->now()->subtract( days => 1 ), @@ -237,7 +237,7 @@ subtest 'test translation of auto-added comment from old-style Open311 update' = my $o = Open311->new( jurisdiction => 'mysociety', endpoint => 'http://example.com', test_mode => 1, test_get_returns => { 'requests.xml' => $requests_xml } ); FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'fixamingata' ], + ALLOWED_COBRANDS => [ 'fiksgatami' ], }, sub { ok $updates->update_reports( [ 638346 ], $o, $body ), 'Updated reports'; }; @@ -247,7 +247,7 @@ subtest 'test translation of auto-added comment from old-style Open311 update' = is_deeply(\@qs, [ 'jurisdiction_id=mysociety', 'service_request_id=638346' ], 'query string matches'); is $problem3->comments->count, 1, 'added a comment'; - is $problem3->comments->first->text, "St\xe4ngd av kommunen", 'correct comment text'; + is $problem3->comments->first->text, "(ikke rapportert til administrasjonen)", 'correct comment text'; }; END { |