890 Fix more tests

comicrelief · Jun 1, 2017 · c4bbe14 · c4bbe14
1 parent 1488832
commit c4bbe14
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/ci/travis/dberrors.sh b/ci/travis/dberrors.sh
@@ -12,7 +12,7 @@ FILESIZE=$(cat tmp.txt | wc -c)
 if [ $FILESIZE -ne 0 ] ; then
   cat tmp.txt
   rm -rf tmp.txt
-  exit 0
+  false
 fi
 
 rm -rf tmp.txt

diff --git a/modules/cr_solr/config/install/block.block.seven_exposedformsearchpage_1.yml b/modules/cr_solr/config/install/block.block.seven_exposedformsearchpage_1.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: false
+dependencies:
+  config:
+    - views.view.search
+  module:
+    - views
+id: seven_exposedformsearchpage_1
+theme: seven
+region: '-1'
+weight: -6
+provider: null
+plugin: 'views_exposed_filter_block:search-page_1'
+settings:
+  id: 'views_exposed_filter_block:search-page_1'
+  label: ''
+  provider: views
+  label_display: '0'
+  views_label: ''
+visibility: {  }
diff --git a/modules/cr_solr/cr_solr.info.yml b/modules/cr_solr/cr_solr.info.yml
@@ -13,3 +13,4 @@ config_devel:
   - search_api.index.solr_content
   - views.view.search
   - block.block.exposedformsearchpage_1
+  - block.block.seven_exposedformsearchpage_1
diff --git a/tests/behat/features/article.feature b/tests/behat/features/article.feature
@@ -12,18 +12,18 @@ Feature: Article
   Scenario: Article pagination on /whats-going-on
     Given I am on "whats-going-on"
     And I click "››"
-    And I wait for "3" seconds
+    And I wait for 3 seconds
     Then I should see the link "British Triathlon cheers Greg James on"
     And I click "‹‹"
-    And I wait for "3" seconds
+    And I wait for 3 seconds
     Then I should see the link "Greg James begins his Gregathlon for Sport Relief"
 
   @api @default-content
   Scenario: News page /yplan-partners-sport-relief
     Given I am logged in as a user with the "editor" role
     And I am on "/news-tv-and-events/news/yplan-partners-sport-relief"
     And I follow "Edit"
-    And I wait for "3" seconds
+    And I wait for 3 seconds
     And I enter "YPlan partners with Comic Relief" for "edit-title-0-value"
     And press "Save"
     And I go to "/news-tv-and-events/news/yplan-partners-sport-relief"
@@ -64,7 +64,7 @@ Feature: Article
     And I am on "news-tv-and-events/news"
     Then I should not see "Test Scheduled article"
     # wait till content should be published then log back in
-    And I wait for "30" seconds
+    And I wait for 30 seconds
     And I am logged in as a user with the "administrator" role
     # run cron and clear caches
     And am on "admin/config/system/cron"

diff --git a/tests/behat/features/bootstrap/DrupalCRFeatureContext.php b/tests/behat/features/bootstrap/DrupalCRFeatureContext.php
@@ -73,7 +73,7 @@ public function iWaitForAJAX() {
    *   If element cannot be found
    */
   public function iEnterTodaysDateFor($field) {
-    $date = date("Y-m-j");
+    $date = date('Y-m-d');
     $this->getSession()->getPage()->fillField($field, $date);
   }
 

diff --git a/tests/behat/features/simple-xml-sitemap.feature b/tests/behat/features/simple-xml-sitemap.feature
@@ -2,7 +2,6 @@ Feature: Simple-XML-Sitemap
 
   @api
   Scenario: Check sitemap.xml url addresses
-    Given I go to "/sitemap.xml"
-    And I run cron
-    And I wait for 2 seconds
+    Given I run cron
+    And I go to "/sitemap.xml"
     Then I should see "/partners" as a sitemap url