Merge pull request #1176 from pantheon-systems/change/active_features

Updated testing suite to target tests/active_features

scripts/lint.sh

@@ -18,7 +18,7 @@ eval $cmd
 
 #Run PHP Code Sniffer on command files using a standards subset excepting long lines
 phpcs="vendor/bin/phpcs --standard=tests/config/context_standards.xml --extensions=php --warning-severity=6 --error-severity=1"
-cmd=$phpcs+" tests/features/bootstrap/FeatureContext.php tests/features/bootstrap/10FeatureContext.php"
+cmd=$phpcs+" tests/features/bootstrap/FeatureContext.php tests/active_features/bootstrap/FeatureContext.php"
 eval $cmd
 
 #Enforce PSR2 on 1.x

scripts/test.sh

@@ -13,14 +13,18 @@ for f in $( git diff-tree $TRAVIS_COMMIT --name-status -r | grep php | grep -v "
 
 # Run the functional tests
 behat_cmd="vendor/bin/behat -c=tests/config/behat.yml --suite="
+behat_cmd_10="vendor/bin/behat -c=tests/config/behat.yml --suite="
 if [ ! -z $1 ]; then
   behat_cmd+=$1
+  behat_cmd_10+=$1+"_10"
 else
   behat_cmd+="default"
+  behat_cmd_10+="default_10"
 fi
 if [ -z $2 ]; then
   # Run the unit tests if we are not targeting a feature
   vendor/bin/phpunit -c tests/config/phpunit.xml.dist --debug
   vendor/bin/phpunit -c tests/config/phpunit-10.xml.dist --debug
 fi
 eval $behat_cmd
+eval $behat_cmd_10

src/Commands/MachineToken/ListCommand.php

@@ -20,7 +20,7 @@ class ListCommand extends TerminusCommand
      * @usage terminus machine-token:list
      *   Lists your user's machine tokens
      */
-    public function list() {
+    public function listTokens() {
 
     }
 

src/Runner.php

@@ -14,7 +14,7 @@ class Runner
     /**
      * @var string
      */
-    private $commands_directory = __DIR__ . '/Commands';
+    private $commands_directory;
     /**
      * @var string
      */
@@ -27,6 +27,7 @@ class Runner
      */
     public function __construct(array $options = [])
     {
+        $this->commands_directory = __DIR__ . '/Commands';
         $this->application = new Terminus();
         $this->configureApplication(new Config($options));
     }

tests/config/behat.yml

@@ -21,12 +21,10 @@ default:
               machine_token_device:    'Behat Testing Token'
               machine_token_id:        'dcr_q4tFMiYiK9DfJO15'
     default_10:
-      paths: [ %paths.base%/../newfeatures ]
+      paths: [ %paths.base%/../active_features ]
       contexts:
         - FeatureContext:
-              username:                '[email protected]'
               user_uuid:               '11111111-1111-1111-1111-111111111111'
-              password:                'SCRUBBED'
               host:                    'onebox'
               vcr_mode:                'none'
               test_site_name:          'behat-tests'