run behat on theme - corrections

Author: marinaglancy

src/Command/BehatCommand.php

@@ -46,7 +46,7 @@ protected function configure()
 
         $this->setName('behat')
             ->addOption('profile', 'p', InputOption::VALUE_REQUIRED, 'Behat profile to use', 'default')
-            ->addOption('suite', 's', InputOption::VALUE_REQUIRED, 'Behat suite to use (Moodle theme)', 'default')
+            ->addOption('suite', null, InputOption::VALUE_REQUIRED, 'Behat suite to use (Moodle theme)', 'default')
             ->addOption('start-servers', null, InputOption::VALUE_NONE, 'Start Selenium and PHP servers')
             ->addOption('jar', null, InputOption::VALUE_REQUIRED, 'Path to Selenium Jar file', $jar)
             ->addOption('auto-rerun', null, InputOption::VALUE_REQUIRED, 'Number of times to rerun failures', 2)

src/Installer/TestSuiteInstaller.php

@@ -112,7 +112,7 @@ public function getBehatInstallProcesses()
 
         return [
             new Process($curl, null, null, null, 120),
-            new MoodleProcess(sprintf('%s --install --add-core-features-to-theme', $this->getBehatUtility())),
+            new MoodleProcess(sprintf('%s --install', $this->getBehatUtility())),
         ];
     }
 
@@ -143,7 +143,7 @@ public function getPostInstallProcesses()
 
         if ($this->plugin->hasBehatFeatures()) {
             $this->getOutput()->debug('Enabling Behat');
-            $processes[] = new MoodleProcess(sprintf('%s --enable', $this->getBehatUtility()));
+            $processes[] = new MoodleProcess(sprintf('%s --enable --add-core-features-to-theme', $this->getBehatUtility()));
         }
         if ($this->plugin->hasUnitTests()) {
             $this->getOutput()->debug('Build PHPUnit config');