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 2017/08/04 16:35:31 UTC

[1/2] incubator-trafficcontrol git commit: fixes tenant test

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master f23f2c3ed -> 8578bf1aa


fixes tenant 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/0042e205
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0042e205
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0042e205

Branch: refs/heads/master
Commit: 0042e205454ff4058ee2fda53f72a3755767cd29
Parents: f23f2c3
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri Aug 4 10:12:28 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri Aug 4 10:12:28 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/t/api/1.2/tenant_access.t | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0042e205/traffic_ops/app/t/api/1.2/tenant_access.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/tenant_access.t b/traffic_ops/app/t/api/1.2/tenant_access.t
index 4b4829c..8cb2dbf 100644
--- a/traffic_ops/app/t/api/1.2/tenant_access.t
+++ b/traffic_ops/app/t/api/1.2/tenant_access.t
@@ -147,12 +147,18 @@ ok $t->put_ok('/api/1.2/user/current' => {Accept => 'application/json'} =>
 #can change its tenancy to child (fail on another reason, currently on missing email,
 # but if it will not be mandatory anymore it should fail on password mismatch)
 ok $t->put_ok('/api/1.2/user/current' => {Accept => 'application/json'} =>
-        json => { user => { tenantId => $tenants_data->{"A1a"}->{'id'},
-                            localPasswd => "pass",
-                            confirmLocalPasswd => "pass2"} } )
-        ->json_is( "/alerts/0/text" => "email is required")
+        json => { user => {
+                    fullName => 'taco bell',
+                    role => 3,
+                    username => 'taco',
+                    email => 'taco@foo.com',
+                    tenantId => $tenants_data->{"A1a"}->{'id'},
+                    localPasswd => "pass",
+                    confirmLocalPasswd => "pass2"
+            } } )
+        ->json_is( "/alerts/0/text" => "localPasswd Your 'New Password' must match the 'Confirm New Password'.")
         ->status_is(400)->or( sub { diag $t->tx->res->content->asset->{content}; } )
-    , 'Can change my tenancy: tenant: A1?';
+    , 'Does current user update fail when localPasswd != confirmLocalPasswd?';
 logout_from_tenant();
 #access to himself
 test_tenants_allow_access ("A1", "A1", $tenants_data);


[2/2] incubator-trafficcontrol git commit: This closes #776.

Posted by da...@apache.org.
This closes #776.


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

Branch: refs/heads/master
Commit: 8578bf1aa605e3c4e70374413535ddfe0b9fbccd
Parents: 0042e20
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Aug 4 10:35:25 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Aug 4 10:35:25 2017 -0600

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

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