fix

Author: Richard McDaniel

.travis.yml

@@ -9,20 +9,20 @@ before_script:
     - sudo a2enmod rewrite actions fastcgi alias
     - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
     - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-    - sudo cp -f tests/travis-ci-apache /etc/apache2/sites-available/default
+    - sudo cp -f build/travis-ci-apache /etc/apache2/sites-available/default
     - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
     - sudo service apache2 restart
     - mysql -e 'create database acs;'
     - php api/index.php cli install
     - php api/index.php cli add administrator [email protected] password123
-    - cd tests && composer install && cd ..
-    - patch -p0 < tests/sauce.patch
+    - composer install
+    - patch -p0 < build/sauce.patch
 
 script:
-    - tests/vendor/bin/phpunit --configuration `pwd`/tests/phpunit.xml --coverage-clover build/logs/clover.xml
-    - tests/vendor/bin/paratest -p 8 -f --phpunit=tests/vendor/bin/phpunit tests/selenium.php
+    - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+    - vendor/bin/paratest -p 8 -f --phpunit=vendor/bin/phpunit tests/SeleniumTest.php
 
-after_script: tests/vendor/bin/test-reporter
+after_script: vendor/bin/test-reporter
 
 env:
     global:

tests/bootstrap.php renamed to build/bootstrap.php

@@ -1,5 +1,5 @@
---- tests/vendor/sauce/sausage/src/Sauce/Sausage/SauceAPI.php	2015-05-15 19:10:35.163364000 -0400
-+++ tests/vendor/sauce/sausage/src/Sauce/Sausage/SauceAPI.php	2015-05-15 19:10:33.203364000 -0400
+--- vendor/sauce/sausage/src/Sauce/Sausage/SauceAPI.php	2015-05-15 19:10:35.163364000 -0400
++++ vendor/sauce/sausage/src/Sauce/Sausage/SauceAPI.php	2015-05-15 19:10:33.203364000 -0400
 @@ -78,7 +78,7 @@
          $response = curl_exec($ch);
 

tests/sauce.patch renamed to build/sauce.patch

@@ -12,10 +12,10 @@
     syntaxCheck="false"
     cacheTokens="true"
     verbose="false"
-    bootstrap="bootstrap.php">
+    bootstrap="build/bootstrap.php">
   <testsuites>
     <testsuite name="unit">
-      <file>unit.php</file>
+      <file>tests/UnitTest.php</file>
     </testsuite>
   </testsuites>
 </phpunit>

tests/travis-ci-apache renamed to build/travis-ci-apache

@@ -0,0 +1,40 @@
+<?php
+
+// require_once 'vendor/autoload.php';
+
+// class Run extends Sauce\Sausage\WebDriverTestCase
+// {
+
+//     protected $start_url = 'http://localhost';
+
+//     public static $browsers = array(
+//         array(
+//             'browserName' => 'chrome',
+//             'desiredCapabilities' => array(
+//                 'platform' => 'Linux'
+//           )
+//         )
+//     );
+
+//     public function testTitle()
+//     {
+//         $this->assertContains("AngularJS CodeIgniter Seed", $this->title());
+//     }
+
+
+//     public function testUrl()
+//     {
+//         $this->assertContains("http://localhost/#/home", $this->url());
+//     }
+
+//     public function testLogin()
+//     {
+//         $this->url('http://localhost/#/login');
+//         $this->assertTextNotPresent("Logout");
+//         $this->byName('email')->value('[email protected]');
+//         $this->byName('password')->value('password123');
+//         $this->byName('login')->submit();
+//         $this->assertTextPresent("Logout");
+//     }
+
+// }