Upgrade to WordHat 3 (#114)

.gitignore

@@ -37,7 +37,6 @@ web/wp-content/mu-plugins/*
 !web/wp-content/mu-plugins/alter-wpcfm-config-path.php
 !web/wp-content/plugins/
 web/wp-content/plugins/*
-!web/wp-content/plugins/lh-hsts
 !web/wp-content/themes
 web/wp-content/themes/*
 !web/wp-content/themes/twentyseventeen-child/

composer.json

@@ -21,16 +21,18 @@
     "roots/wp-password-bcrypt": "^1.0.0",
     "rvtraveller/qs-composer-installer": "^1.1",
     "vlucas/phpdotenv": "2.*",
+    "wpackagist-plugin/lh-hsts": "^1.24",
     "wpackagist-plugin/pantheon-advanced-page-cache": "*",
     "wpackagist-plugin/wp-native-php-sessions": "0.*",
-    "wpackagist-plugin/wordpress-importer": "0.*",
     "wpackagist-theme/twentyseventeen": "1.*"
   },
   "require-dev": {
+    "behat/mink-goutte-driver": "^1.2",
+    "behat/mink-selenium2-driver": "^1.3",
     "brain/monkey": "~2.2.0",
     "dealerdirect/phpcodesniffer-composer-installer": "~0.4.4",
     "pantheon-systems/quicksilver-pushback": "~1",
-    "paulgibbs/behat-wordpress-extension": "~0.9.2",
+    "paulgibbs/behat-wordpress-extension": "3.*",
     "phpunit/phpunit": "~6.5.4",
     "roave/security-advisories": "dev-master",
     "squizlabs/php_codesniffer": "3.2.2",

tests/behat/behat-lando.yml

@@ -12,7 +12,9 @@ default:
     PaulGibbs\WordpressBehatExtension:
       site_url: https://nginx/wp
       users:
-        admin:
+        -
+          roles:
+            - administrator
           username: admin
           password: admin
       wpcli:

tests/behat/features/admin-login.feature

@@ -3,8 +3,10 @@ Feature: Login as an administrator (no-js)
   I want basic login behavior to work
   So that I can administer the site
 
+Background:
+    Given I am logged in as an administrator
+    Given I am on the dashboard
+
   Scenario: Confirm access to create users
-    Given I am logged in as an admin
-    When I am on the dashboard
-    And I go to menu item "Users > Add New"
-    Then I should see "Add New User"
+    Given I go to the menu "Users > Add New"
+    Then I should see "Add New User"

tests/behat/features/blogname.feature

@@ -4,22 +4,22 @@ Feature: Change blogname and blogdescription (no-js)
   So that I have control over my site
 
   Background:
-    Given I am logged in as an admin
+    Given I am logged in as an administrator
     Given I am on the dashboard
 
 
   Scenario: Saving blogname
-    Given I go to menu item "Settings > General"
+    Given I go to the menu "Settings > General"
     When I fill in "blogname" with "Awesome WordHat Test Site"
     And I press "submit"
     And I should see "Settings saved."
     And I am on the homepage
     Then I should see "Awesome WordHat Test Site" in the "h1 a" element
 
   Scenario: Saving blogdescription
-    Given I go to menu item "Settings > General"
+    Given I go to the menu "Settings > General"
     When I fill in "blogdescription" with "GitHub + Composer + CircleCi + Pantheon = Win!"
     And I press "submit"
     And I should see "Settings saved."
     And I am on the homepage
-    Then I should see "GitHub + Composer + CircleCi + Pantheon = Win!" in the ".site-description" element
+    Then I should see "GitHub + Composer + CircleCi + Pantheon = Win!" in the ".site-description" element