Skip to content

Commit

Permalink
Revert "Try to test the installer"
Browse files Browse the repository at this point in the history
This reverts commit 5c6e160.
  • Loading branch information
danrwalker committed Mar 6, 2019
1 parent 253f89b commit 3d69b77
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -30,12 +30,12 @@ before_install:

install:
- if [[ ${COVERALLS} == "true" ]]; then composer require satooshi/php-coveralls '~1.0'; fi;
# - php ./tests/install.php
- php ./tests/install.php

before_script:
- mkdir -p ./build/logs
- mysql -e "USE travis_ci_twist_test; SHOW TABLES;"
# - sed -i 's/Twist::ServeRoutes(false);/echo "TwistPHP Framework Loaded!\n\n";/g' ./tests/index.php
- sed -i 's/Twist::ServeRoutes(false);/echo "TwistPHP Framework Loaded!\n\n";/g' ./tests/index.php
- if [[ ${GULP} == "true" ]]; then npm install -g gulp; fi;

script:
Expand Down
2 changes: 2 additions & 0 deletions phpunit.xml
Expand Up @@ -24,7 +24,9 @@
<whitelist>
<directory>./dist/twist</directory>
<exclude>
<file>./dist/twist/framework.php</file>
<directory>./dist/twist/Config</directory>
<file>./dist/twist/Core/boot.php</file>
<directory>./docs</directory>
<directory>./src</directory>
<directory>./tests</directory>
Expand Down
53 changes: 0 additions & 53 deletions tests/1-Install/Install.Test.php

This file was deleted.

2 changes: 0 additions & 2 deletions tests/index.php

This file was deleted.

43 changes: 43 additions & 0 deletions tests/install.php
@@ -0,0 +1,43 @@
<?php

$_SERVER['DOCUMENT_ROOT'] = dirname(__FILE__).'/';

define('TWIST_PACKAGES',realpath(dirname(__FILE__).'/../dist/packages/').'/');
define('TWIST_PACKAGE_INSTALL',realpath(dirname(__FILE__).'/../dist/packages/install/').'/');

/**
* We don't want to create a user upon setup at this point
*/
define("TWIST_QUICK_INSTALL", json_encode(array(
'database' => array(
'type' => 'database',
'protocol' => 'mysqli',
'host' => 'localhost',
'username' => 'root',
'password' => '',
'name' => 'travis_ci_twist_test',
'table_prefix' => 'twist_'
),
'settings' => array(
'site_name' => 'Travis CI Test',
'site_host' => 'localhost',
'site_www' => '0',
'http_protocol' => 'http',
'http_protocol_force' => '0',
'timezone' => 'Europe/London',
'relative_path' => dirname(__FILE__).'/',
'site_root' => '',
'app_path' => 'app',
'packages_path' => 'packages',
'uploads_path' => 'uploads'
)/*,
'user' => array(
'firstname' => 'Travis',
'lastname' => 'CI',
'email' => 'unittest@traviscit.test',
'password' => 'travisci',
'confirm_password' => 'travisci'
)*/
)));

require_once( 'dist/twist/framework.php' );

0 comments on commit 3d69b77

Please sign in to comment.