more cleanup

ubccr · May 13, 2019 · 5ebef00 · 5ebef00
1 parent 38f39dc
commit 5ebef00
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 70 deletions.
diff --git a/tests/artifacts/xdmod/user_admin/input/get_dw_descripters-1.json b/tests/artifacts/xdmod/user_admin/input/get_dw_descripters-1.json
diff --git a/tests/integration/lib/Controllers/UserAdminTest.php b/tests/integration/lib/Controllers/UserAdminTest.php
@@ -399,14 +399,11 @@ public function provideGetTabs()
      * @depends      testCreateUsersSuccess
      * @dataProvider provideGetDwDescripters
      * @group UserAdminTest.createUsers
-     * @param array $user
+     * @param string $username
      * @throws \Exception
      */
-    public function testGetDwDescripters(array $user)
+    public function testGetDwDescripters($username)
     {
-        $this->assertArrayHasKey('username', $user);
-        $username = $user['username'];
-
         $isPublicUser = $username === self::PUBLIC_USER_NAME;
 
         if (!$isPublicUser) {
@@ -459,13 +456,26 @@ public function testGetDwDescripters(array $user)
     }
 
     /**
-     * @return array|object
+     * The @returns for this is misleading.
+     * technically it returns an array of arrays of a single string
+     * however the funtion that gets called from this only ever gets the string
+     * @return string
      * @throws \Exception
      */
     public function provideGetDwDescripters()
     {
-        return JSON::loadFile(
-            $this->getTestFiles()->getFile('user_admin', 'get_dw_descripters-1', 'input')
+        return array(
+            array("admin"),
+            array("centerdirector"),
+            array("centerstaff"),
+            array("principal"),
+            array("normaluser"),
+            array("test.cd.one-center"),
+            array("test.pi"),
+            array("test.normal-user"),
+            array("test.usr_dev"),
+            array("test.usr_mgr"),
+            array("test.usr_mgr_dev")
         );
     }