Merge pull request #217 from jhedstrom/fix-d8

Fix d8 Signed-off-by: Jonathan Hedstrom <jhedstrom@gmail.com>
jhedstrom · Oct 7, 2015 · 2c41b25 · 2c41b25
1 parent 4135a4d
commit 2c41b25
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/features/api.feature b/features/api.feature
@@ -20,7 +20,7 @@ Feature: DrupalContext
     Then I should be on "admin/structure/types/manage/article/fields"
     And I should see text matching "Add new field"
 
-  @drushTest @d8
+  @drushTest
   Scenario: Find a heading in a region
     Given I am not logged in
     When I am on the homepage

diff --git a/features/d8.feature b/features/d8.feature
@@ -24,3 +24,8 @@ Feature: DrupalContext
     And I am logged in as a user with the "administrator" role
     When I visit "admin/people"
     Then I should see the text "Administrator" in the "Joe User" row
+
+  Scenario: Find a heading in a region
+    Given I am not logged in
+    When I am on the homepage
+    Then I should see the heading "Search" in the "left sidebar" region
diff --git a/.../drupal8/modules/behat_test/config/install/field.field.node.post.field_post_reference.yml b/.../drupal8/modules/behat_test/config/install/field.field.node.post.field_post_reference.yml
@@ -4,8 +4,6 @@ dependencies:
   config:
     - field.storage.node.field_post_reference
     - node.type.post
-  module:
-    - entity_reference
 id: node.post.field_post_reference
 field_name: field_post_reference
 entity_type: node

diff --git a/.../drupal8/modules/behat_test/config/install/field.field.user.user.field_post_reference.yml b/.../drupal8/modules/behat_test/config/install/field.field.user.user.field_post_reference.yml
@@ -3,8 +3,6 @@ status: true
 dependencies:
   config:
     - field.storage.user.field_post_reference
-  module:
-    - entity_reference
 id: user.user.field_post_reference
 field_name: field_post_reference
 entity_type: user

diff --git a/fixtures/drupal8/modules/behat_test/config/install/field.field.user.user.field_tags.yml b/fixtures/drupal8/modules/behat_test/config/install/field.field.user.user.field_tags.yml
@@ -5,7 +5,6 @@ dependencies:
     - field.storage.user.field_tags
   module:
     - taxonomy
-    - entity_reference
 id: user.user.field_tags
 field_name: field_tags
 entity_type: user

diff --git a/...res/drupal8/modules/behat_test/config/install/field.storage.node.field_post_reference.yml b/...res/drupal8/modules/behat_test/config/install/field.storage.node.field_post_reference.yml
@@ -2,7 +2,6 @@ langcode: en
 status: true
 dependencies:
   module:
-    - entity_reference
     - node
 id: node.field_post_reference
 field_name: field_post_reference

diff --git a/...res/drupal8/modules/behat_test/config/install/field.storage.user.field_post_reference.yml b/...res/drupal8/modules/behat_test/config/install/field.storage.user.field_post_reference.yml
@@ -2,15 +2,14 @@ langcode: en
 status: true
 dependencies:
   module:
-    - entity_reference
     - user
 id: user.field_post_reference
 field_name: field_post_reference
 entity_type: user
 type: entity_reference
 settings:
   target_type: node
-module: entity_reference
+module: core
 locked: false
 cardinality: -1
 translatable: true

diff --git a/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_tags.yml b/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_tags.yml
@@ -10,7 +10,7 @@ entity_type: user
 type: entity_reference
 settings:
   target_type: taxonomy_term
-module: entity_reference
+module: core
 locked: false
 cardinality: -1
 translatable: true

diff --git a/...ures/drupal8/modules/behat_test/src/Plugin/Field/FieldFormatter/AddressFieldFormatter.php b/...ures/drupal8/modules/behat_test/src/Plugin/Field/FieldFormatter/AddressFieldFormatter.php
@@ -80,7 +80,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function viewElements(FieldItemListInterface $items) {
+  public function viewElements(FieldItemListInterface $items, $language) {
     $elements = [];
 
     foreach ($items as $delta => $item) {