Merge pull request #487 from carlfeberhard/testing

Testing, casperjs: fix the hda api show assertion in the anon tests
galaxyproject · Jul 22, 2015 · 95f63e7 · 95f63e7
2 parents 96efac8 + d28f1c7
commit 95f63e7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/test/casperjs/api-anon-history-permission-tests.js b/test/casperjs/api-anon-history-permission-tests.js
@@ -106,9 +106,11 @@ spaceghost.test.begin( 'Test permissions for accessible, published, and inaccess
         this.api.assertRaises( function(){
             this.api.hdas.index( history.id );
         }, 403, 'History is not accessible by user', 'hda index failed with error' );
-        this.api.assertRaises( function(){
-            this.api.hdas.show( history.id, hdas[0].id );
-        }, 403, 'History is not accessible by user', 'hda show failed with error' );
+        // 150721: accessible hdas in an inaccessible history are considered accessible (since api/datasets does)
+        // this.api.assertRaises( function(){
+        //     this.api.hdas.show( history.id, hdas[0].id );
+        // }, 403, 'History is not accessible by user', 'hda show failed with error' );
+        this.test.assertTrue( utils.isObject( this.api.hdas.show( history.id, hdas[0].id ) ) );
 
         this.test.comment( 'Attempting to copy an accessible hda (default is accessible)'
                          + ' from an inaccessible history should fail for: ' + history.name );