Fix #144

Signed-off-by: Zac Sturgess <[email protected]>
zsturgess · May 2, 2016 · f9d8a40 · f9d8a40
1 parent c099271
commit f9d8a40
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/src/ResultBundle/Tests/E2E/ViewTestTest.php b/src/ResultBundle/Tests/E2E/ViewTestTest.php
@@ -82,6 +82,15 @@ public function testEditDeleteAndRunInsufficentPermissions()
         $this->assertFalse($this->getActionItem(2)->isDisplayed());
         $this->assertFalse($this->getActionItem(3)->isDisplayed());
     }
+
+    public function testEditDeleteAndRunAsAdmin() {
+        $this->logInAsUser('user-3');
+        $this->clickThroughToTest(1);
+
+        $this->assertTrue($this->getActionItem(1)->isDisplayed());
+        $this->assertTrue($this->getActionItem(2)->isDisplayed());
+        $this->assertTrue($this->getActionItem(3)->isDisplayed());
+    }
 
     private function clickThroughToTest($number)
     {

diff --git a/src/TestBundle/Tests/E2E/DashboardTest.php b/src/TestBundle/Tests/E2E/DashboardTest.php
@@ -206,7 +206,7 @@ public function testRunTest()
 
         $this->assertContains(TestFixtures::$tests['test-1']->getName(), $this->getHeaderText());
         $this->assertCount(4, $this->webDriver->findElements(
-            WebDriverBy::cssSelector('.result span')
+            WebDriverBy::cssSelector('.result')
         ));
     }
 

diff --git a/web/assets/lib/app.min.js b/web/assets/lib/app.min.js
diff --git a/web/assets/lib/src/helpers.js b/web/assets/lib/src/helpers.js
@@ -55,7 +55,12 @@ overwatchApp.factory('isGranted', [
                     return userHasRole('ROLE_SUPER_ADMIN');
                     break;
                 case 'ADMIN':
-                    return userHasRole('ROLE_ADMIN') && userInGroup(group);
+                    if (typeof group === 'undefined') {
+                        return userHasRole('ROLE_ADMIN');
+                    } else {
+                        return userHasRole('ROLE_ADMIN') && userInGroup(group);
+                    }
+
                     break;
                 case 'USER':
                     return userInGroup(group);

diff --git a/web/assets/styles/app.css b/web/assets/styles/app.css
diff --git a/web/partials/dashboard.html b/web/partials/dashboard.html
@@ -23,9 +23,9 @@ <h1>Dashboard</h1>
             <ul class="tests">
                 <li data-ng-repeat="test in group.tests">
                     <div class="test">
-                        <div class="status {{ test.result.status|lowercase }}" title="{{ test.result.status|lowercase|ucfirst }}"></div>
+                        <div class="status {{ test.result.status|lowercase }}" data-ng-attr-title="{{ test.result.status|lowercase|ucfirst }}" title="Not yet run"></div>
 
-                        <h3>{{ test.name }} (Last Tested <span title="{{ (test.result.createdAt + '000')|date:'medium' }}">{{ test.result.createdAt|timeago }}</span>)</h3>
+                        <h3><a href="#/test/{{ test.id }}" title="View test '{{ test.name }}'">{{ test.name }}</a> (Last Tested <span title="{{ (test.result.createdAt + '000')|date:'medium' }}">{{ test.result.createdAt|timeago }}</span>)</h3>
                         <p class="test-expect">Expect {{ test.actual }} {{ test.expectation }} {{ test.expected }} </p>
 
                         <div class="buttons">

diff --git a/web/partials/viewTest.html b/web/partials/viewTest.html
@@ -18,9 +18,9 @@ <h1>View Test '{{ test.name }}'</h1>
         </ul>
 
         <div class="row">
-            <a class="btn btn-grey" href="#/test/{{ test.id }}/edit" title="Edit test '{{ test.name }}'" data-ng-show="isGranted('ADMIN', group)"><i class="fa fa-pencil-square-o"></i> Edit test</a>
-            <a class="btn btn-red" data-ng-click="removeTest(test.id)" title="Delete test '{{ test.name }}'" data-ng-show="isGranted('ADMIN', group)"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</a>
-            <a class="btn btn-blue" data-ng-click="runTest(test.id)" title="Run test '{{ test.name }}' now" data-ng-show="isGranted('ADMIN', group)"><i class="fa fa-play" aria-hidden="true"></i> Run</a>
+            <a class="btn btn-grey" href="#/test/{{ test.id }}/edit" title="Edit test '{{ test.name }}'" data-ng-show="isGranted('ADMIN')"><i class="fa fa-pencil-square-o"></i> Edit test</a>
+            <a class="btn btn-red" data-ng-click="removeTest(test.id)" title="Delete test '{{ test.name }}'" data-ng-show="isGranted('ADMIN')"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</a>
+            <a class="btn btn-blue" data-ng-click="runTest(test.id)" title="Run test '{{ test.name }}' now" data-ng-show="isGranted('ADMIN')"><i class="fa fa-play" aria-hidden="true"></i> Run</a>
             <a class="btn btn-blue" data-ng-click="loadOlderResults()" title="Show older results" data-ng-show="(test.results.length === lastRequestedResultSize)"><i class="fa fa-eye"></i> Show older results</a>
         </div>
     </div>