You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/04/19 21:05:45 UTC

[1/2] incubator-trafficcontrol git commit: This closes #485

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 142f94391 -> a7bdd0845


This closes #485


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a7bdd084
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a7bdd084
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a7bdd084

Branch: refs/heads/master
Commit: a7bdd08453d27fa11c1985dfb4cb5a1d9c18b4b6
Parents: 9e1ac2c
Author: Dewayne Richardson <de...@apache.org>
Authored: Wed Apr 19 15:00:00 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Apr 19 15:00:00 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/2] incubator-trafficcontrol git commit: fixes broken asn test

Posted by de...@apache.org.
fixes broken asn test


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9e1ac2cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9e1ac2cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9e1ac2cc

Branch: refs/heads/master
Commit: 9e1ac2cc97ae0568c1bd504e5798d49f3aefca10
Parents: 142f943
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Apr 19 09:52:28 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Apr 19 15:00:00 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/t/api/1.1/asn.t | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9e1ac2cc/traffic_ops/app/t/api/1.1/asn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/asn.t b/traffic_ops/app/t/api/1.1/asn.t
index be1a008..4d5c3c8 100644
--- a/traffic_ops/app/t/api/1.1/asn.t
+++ b/traffic_ops/app/t/api/1.1/asn.t
@@ -40,15 +40,15 @@ Test::TestHelper->load_core_data($schema);
 ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
 	->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
-$t->get_ok("/api/1.1/asns.json")->status_is(200)->json_is( "/response/asns/0/id", 100 )->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )
-	->json_is( "/response/asns/0/asn", 9939 )->or( sub { diag $t->tx->res->content->asset->{content}; } );
+$t->get_ok("/api/1.1/asns")->status_is(200)->json_is( "/response/0/id", 100 )->json_is( "/response/0/cachegroup", "mid-northeast-group" )
+	->json_is( "/response/0/asn", 9939 )->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
-$t->get_ok("/api/1.1/asns.json?orderby=id")->status_is(200)->json_is( "/response/asns/0/id", 100 )
-	->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )->json_is( "/response/asns/0/asn", 9939 )
+$t->get_ok("/api/1.1/asns?orderby=id")->status_is(200)->json_is( "/response/0/id", 100 )
+	->json_is( "/response/0/cachegroup", "mid-northeast-group" )->json_is( "/response/0/asn", 9939 )
 	->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
-$t->get_ok("/api/1.1/asns.json?orderby=cachegroup")->status_is(200)->json_is( "/response/asns/0/id", 100 )
-	->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )->json_is( "/response/asns/0/asn", 9939 )
+$t->get_ok("/api/1.1/asns?orderby=cachegroup")->status_is(200)->json_is( "/response/0/id", 100 )
+	->json_is( "/response/0/cachegroup", "mid-northeast-group" )->json_is( "/response/0/asn", 9939 )
 	->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
 ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );