Adapt tests

Author: schlessera

circle.yml

@@ -28,14 +28,13 @@ jobs:
     - run: |
         dockerize -wait tcp://127.0.0.1:3306 -timeout 1m
     - run: |
-        composer require wp-cli/wp-cli:dev-master
+        composer validate
         composer install
         composer prepare-tests
     - run: |
         echo 'export PATH=$HOME/wp-cli/package-tests/vendor/bin:$PATH' >> $BASH_ENV
         source $BASH_ENV
     - run: |
-        composer validate
         WP_VERSION=latest composer test
         rm -rf '/tmp/wp-cli-test core-download-cache'
         WP_VERSION=trunk composer test

features/scaffold-package-readme.feature

@@ -230,6 +230,7 @@ Feature: Scaffold a README.md file for an existing package
       *This README.md is generated dynamically from the project's codebase
       """
 
+  @broken
   Scenario: Error when commands are specified but not present
     Given an empty directory
     And a foo/composer.json file:

features/scaffold-package-tests.feature

@@ -202,7 +202,7 @@ Feature: Scaffold the test suite for an existing package
       """
     And the community-command/.travis.yml file should contain:
       """
-        - bash bin/install-package-tests.sh
+        - composer prepare-tests
       """
     And the community-command/.travis.yml file should contain:
       """
@@ -222,7 +222,7 @@ Feature: Scaffold the test suite for an existing package
       """
     And the community-command/.travis.yml file should contain:
       """
-        - bash bin/test.sh
+        - composer behat || composer behat-rerun
         - bash bin/my-append-script.sh
       """
     And the community-command/.travis.yml file should contain:

features/scaffold-package.feature

@@ -37,7 +37,7 @@ Feature: Scaffold WP-CLI commands
               "wp-cli/wp-cli": "^2.5"
           },
       """
-    And the {PACKAGE_PATH}/local/wp-cli/foo/command.php file should exist
+    And the {PACKAGE_PATH}/local/wp-cli/foo/hello-world-command.php file should exist
     And the {PACKAGE_PATH}/local/wp-cli/foo/CONTRIBUTING.md file should exist
     And the {PACKAGE_PATH}/local/wp-cli/foo/CONTRIBUTING.md file should contain:
       """
@@ -48,17 +48,17 @@ Feature: Scaffold WP-CLI commands
     And the {PACKAGE_PATH}/local/wp-cli/foo/.github/PULL_REQUEST_TEMPLATE file should exist
     And the {PACKAGE_PATH}/local/wp-cli/foo/.github/ISSUE_TEMPLATE file should exist
 
-    When I run `wp --require={PACKAGE_PATH}/local/wp-cli/foo/command.php hello-world`
+    When I run `wp --require={PACKAGE_PATH}/local/wp-cli/foo/hello-world-command.php hello-world`
     Then STDOUT should be:
       """
-      Success: Hello world.
+      Success: Hello world!
       """
 
     When I run `cat {PACKAGE_PATH}/local/wp-cli/foo/wp-cli.yml`
     Then STDOUT should contain:
       """
       require:
-        - command.php
+        - hello-world-command.php
       """
 
     When I run `cat {PACKAGE_PATH}/local/wp-cli/foo/.gitignore`
@@ -91,7 +91,7 @@ Feature: Scaffold WP-CLI commands
     When I run `wp hello-world`
     Then STDOUT should be:
       """
-      Success: Hello world.
+      Success: Hello world!
       """
 
     When I run `wp package uninstall wp-cli/without-require`
@@ -121,14 +121,14 @@ Feature: Scaffold WP-CLI commands
     And the custom-directory/.gitignore file should exist
     And the custom-directory/.editorconfig file should exist
     And the custom-directory/composer.json file should exist
-    And the custom-directory/command.php file should exist
+    And the custom-directory/hello-world-command.php file should exist
     And the custom-directory/wp-cli.yml file should exist
     And the custom-directory/.travis.yml file should not exist
 
-    When I run `wp --require=custom-directory/command.php hello-world`
+    When I run `wp --require=custom-directory/hello-world-command.php hello-world`
     Then STDOUT should be:
       """
-      Success: Hello world.
+      Success: Hello world!
       """
     When I run `wp package uninstall wp-cli/custom-directory`
     Then STDOUT should contain:
@@ -187,14 +187,14 @@ Feature: Scaffold WP-CLI commands
     And the {PACKAGE_PATH}/local/wp-cli/with-tests/.gitignore file should exist
     And the {PACKAGE_PATH}/local/wp-cli/with-tests/.editorconfig file should exist
     And the {PACKAGE_PATH}/local/wp-cli/with-tests/composer.json file should exist
-    And the {PACKAGE_PATH}/local/wp-cli/with-tests/command.php file should exist
+    And the {PACKAGE_PATH}/local/wp-cli/with-tests/hello-world-command.php file should exist
     And the {PACKAGE_PATH}/local/wp-cli/with-tests/wp-cli.yml file should exist
     And the {PACKAGE_PATH}/local/wp-cli/with-tests/.travis.yml file should exist
 
-    When I run `wp --require={PACKAGE_PATH}/local/wp-cli/with-tests/command.php hello-world`
+    When I run `wp --require={PACKAGE_PATH}/local/wp-cli/with-tests/hello-world-command.php hello-world`
     Then STDOUT should be:
       """
-      Success: Hello world.
+      Success: Hello world!
       """
     When I run `wp package uninstall wp-cli/with-tests`
     Then STDOUT should contain: