Merge pull request #6 from herbdool/1.x-1.x

Get tests running and entity_access fix
backdrop-ops · Apr 4, 2017 · 196827a · 196827a
2 parents 36c7f9a + ef94ba2
commit 196827a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 380 deletions.
diff --git a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
@@ -305,7 +305,7 @@ protected function reAlterQuery(SelectQueryInterface $query, $tag, $base_table)
    */
   public function getLabel($entity) {
     $target_type = $this->field['settings']['target_type'];
-    return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -');
+    return entityreference_entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -');
   }
 
   /**

diff --git a/tests/entityreference.admin.test b/tests/entityreference.admin.test
@@ -9,16 +9,9 @@
  * Test for Entity Reference admin UI.
  */
 class EntityReferenceAdminTestCase extends BackdropWebTestCase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Entity Reference UI',
-      'description' => 'Tests for the administrative UI.',
-      'group' => 'Entity Reference',
-    );
-  }
 
   public function setUp() {
-    parent::setUp(array('field_ui', 'entity', 'ctools', 'entityreference'));
+    parent::setUp(array('field_ui', 'entity', 'entityreference'));
 
     // Create test user.
     $this->admin_user = $this->backdropCreateUser(array('access content', 'administer content types', 'administer fields'));

diff --git a/tests/entityreference.feeds.test b/tests/entityreference.feeds.test
diff --git a/tests/entityreference.handlers.test b/tests/entityreference.handlers.test
@@ -9,13 +9,6 @@
  * Test for Entity Reference handlers.
  */
 class EntityReferenceHandlersTestCase extends BackdropWebTestCase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Entity Reference Handlers',
-      'description' => 'Tests for the base handlers provided by Entity Reference.',
-      'group' => 'Entity Reference',
-    );
-  }
 
   public function setUp() {
     parent::setUp('entityreference');

diff --git a/tests/entityreference.taxonomy.test b/tests/entityreference.taxonomy.test
@@ -4,13 +4,6 @@
  * Test for Entity Reference taxonomy integration.
  */
 class EntityReferenceTaxonomyTestCase extends BackdropWebTestCase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Entity Reference Taxonomy',
-      'description' => 'Tests nodes with reference to terms as indexed.',
-      'group' => 'Entity Reference',
-    );
-  }
 
   public function setUp() {
     parent::setUp('entityreference', 'taxonomy');

diff --git a/tests/entityreference.tests.info b/tests/entityreference.tests.info
@@ -0,0 +1,17 @@
+[EntityReferenceAdminTestCase]
+name = Entity Reference UI
+description = Tests for the administrative UI.
+group = Entity Reference
+file = entityreference.admin.test
+
+[EntityReferenceHandlersTestCase]
+name = Entity Reference Handlers
+description = Tests for the base handlers provided by Entity Reference.
+group = Entity Reference
+file = entityreference.handlers.test
+
+[EntityReferenceTaxonomyTestCase]
+name = Entity Reference Taxonomy
+description = Tests nodes with reference to terms as indexed.
+group = Entity Reference
+file = entityreference.taxonomy.test
diff --git a/tests/feeds_test.csv b/tests/feeds_test.csv
diff --git a/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info b/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info