diff -u b/tests/entityreference.form.test b/tests/entityreference.form.test --- b/tests/entityreference.form.test +++ b/tests/entityreference.form.test @@ -25,7 +25,7 @@ * {@inheritdoc} */ public function setUp() { - parent::setUp(array('entity', 'ctools', 'views', 'entityreference')); + parent::setUp(array('node', 'entity', 'ctools', 'views', 'entityreference')); // Create test user. $this->admin_user = $this->drupalCreateUser(array('bypass node access')); @@ -94,7 +94,7 @@ * Test that the Views autocomplete widget validates the value properly. */ public function testAutocompleteValidationWithViewsSelectionHandler() { - $view = $this->createNodeEntityReferenceView(); + list($view_name, $display_name) = $this->createNodeEntityReferenceView(); $type_referenced = $this->drupalCreateContentType(); $type_referencing = $this->drupalCreateContentType(); @@ -107,8 +107,8 @@ "target_type" => "node", "handler_settings" => array( "view" => array( - "view_name" => $view->name, - "display_name" => "entityreference_1", + "view_name" => $view_name, + "display_name" => $display_name, "args" => array(), ), "behaviors" => array( @@ -213,12 +213,15 @@ * A Views view with a node Entity Reference display. */ protected function createNodeEntityReferenceView() { + $view_name = 'test_entityreference_select_node'; + $display_name = 'entityreference_1'; + $view = new view(); - $view->name = 'test_entityreference_select_node'; + $view->name = $view_name; $view->description = ''; $view->tag = 'default'; $view->base_table = 'node'; - $view->human_name = 'test_entityreference_select_node'; + $view->human_name = $view_name; $view->core = 7; $view->api_version = '3.0'; $view->disabled = FALSE; @@ -249,14 +252,12 @@ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; /* Display: Entity Reference */ - $handler = $view->new_display('entityreference', 'Entity Reference', 'entityreference_1'); + $handler = $view->new_display('entityreference', 'Entity Reference', $display_name); $handler->display->display_options['defaults']['title'] = FALSE; $handler->display->display_options['pager']['type'] = 'some'; $handler->display->display_options['defaults']['style_plugin'] = FALSE; $handler->display->display_options['style_plugin'] = 'entityreference_style'; - $handler->display->display_options['style_options']['search_fields'] = array( - 'title' => 'title', - ); + $handler->display->display_options['style_options']['search_fields'] = array('title' => 'title'); $handler->display->display_options['defaults']['style_options'] = FALSE; $handler->display->display_options['defaults']['row_plugin'] = FALSE; $handler->display->display_options['row_plugin'] = 'entityreference_fields'; @@ -264,7 +265,7 @@ $view->save(); - return $view; + return array($view_name, $display_name); } }