You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/21 19:05:26 UTC
[11/40] incubator-trafficcontrol git commit: fixed the role,
and types test case alignment
fixed the role, and types test case alignment
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/050bf6bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/050bf6bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/050bf6bf
Branch: refs/heads/psql-rebase
Commit: 050bf6bf846ca1fb6e974c0d0c0640e216c7074c
Parents: 54e9a36
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Nov 17 13:48:56 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 21 12:04:09 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/t/api/1.1/roles.t | 2 +-
traffic_ops/app/t/api/1.1/types.t | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/050bf6bf/traffic_ops/app/t/api/1.1/roles.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/roles.t b/traffic_ops/app/t/api/1.1/roles.t
index c720d36..2b21e45 100644
--- a/traffic_ops/app/t/api/1.1/roles.t
+++ b/traffic_ops/app/t/api/1.1/roles.t
@@ -39,7 +39,7 @@ ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => T
->or( sub { diag $t->tx->res->content->asset->{content}; } );
$t->get_ok('/api/1.1/roles.json?orderby=name')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/id", "1" )->json_is( "/response/0/description", "super-user" )->json_is( "/response/0/name", "admin" )
+ ->json_is( "/response/0/id", "4" )->json_is( "/response/0/description", "super-user" )->json_is( "/response/0/name", "admin" )
->json_is( "/response/0/privLevel", "30" )->json_is( "/response/6/description", "block all access" )->json_is( "/response/6/name", "read-only user" )
->json_is( "/response/6/privLevel", "10" );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/050bf6bf/traffic_ops/app/t/api/1.1/types.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/types.t b/traffic_ops/app/t/api/1.1/types.t
index fc15176..f44fef8 100644
--- a/traffic_ops/app/t/api/1.1/types.t
+++ b/traffic_ops/app/t/api/1.1/types.t
@@ -39,9 +39,9 @@ ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => T
->or( sub { diag $t->tx->res->content->asset->{content}; } );
$t->get_ok('/api/1.1/types.json?orderby=id')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/name", "AAAA_RECORD" )->json_is( "/response/0/description", "Static DNS AAAA entry" )->json_is( "/response/0/useInTable", "staticdnsentry" )
+ ->json_is( "/response/0/name", "EDGE" )->json_is( "/response/0/description", "Edge Cache" )->json_is( "/response/0/useInTable", "server" )
- ->json_is( "/response/22/name", "RASCAL" )->json_is( "/response/22/description", "Rascal health polling & reporting" )->json_is( "/response/22/useInTable", "server" );
+ ->json_is( "/response/22/name", "INFLUXDB" )->json_is( "/response/22/description", "influxdb type" )->json_is( "/response/22/useInTable", "server" );
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();