From 8ad16890da6c6cea478fd8e446970cf86fce4e61 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 11 Jan 2016 16:16:38 +0900
Subject: [PATCH] More cleanup of unit tests

---
 .travis.yml                       |  2 +-
 package.json                      | 16 ----------------
 tests/Install/AutoinstallCept.php |  2 +-
 tests/Install/InstallCept.php     |  6 +++---
 4 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 package.json

diff --git a/.travis.yml b/.travis.yml
index bd4c0a470..7c1edacad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ before_script:
 - if [ $(phpenv version-name) == "5.4" ]; then wget http://codeception.com/releases/2.0.16/codecept.phar; fi
 - if [ ! -f codecept.phar ]; then wget http://codeception.com/codecept.phar; fi
 script:
-- grunt lint
 - if [ -f codecept.phar ]; then php codecept.phar build; fi
 - if [ -f codecept.phar ]; then php codecept.phar run -d --fail-fast --env travis; fi
+- grunt lint
 notifications:
   email: false
diff --git a/package.json b/package.json
deleted file mode 100644
index 0021e2fb3..000000000
--- a/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "RhymiX",
-  "author": "NAVER, RhymiX Developers and Contributors",
-  "license": "GNU LGPL",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rhymix/rhymix.git"
-  },
-  "bugs": {
-    "url": "https://github.com/rhymix/rhymix/issues"
-  },
-  "main": "Gruntfile.js",
-  "scripts": {
-    "test": "grunt"
-  }
-}
diff --git a/tests/Install/AutoinstallCept.php b/tests/Install/AutoinstallCept.php
index 03bc8ee29..b5279717c 100644
--- a/tests/Install/AutoinstallCept.php
+++ b/tests/Install/AutoinstallCept.php
@@ -28,7 +28,7 @@ $install_config = array(
     'db_userid' => $dbinfo['user'],
     'db_password' => $dbinfo['password'],
     'db_database' => $dbinfo['dbname'],
-    'db_table_prefix' =>'xe_',
+    'db_table_prefix' =>'rx',
     'use_rewrite' =>'N',
     'time_zone' =>'0900',
     'email_address' =>'admin@admin.net',
diff --git a/tests/Install/InstallCept.php b/tests/Install/InstallCept.php
index daaf62e98..b574fdb22 100644
--- a/tests/Install/InstallCept.php
+++ b/tests/Install/InstallCept.php
@@ -14,7 +14,7 @@ $dbinfo = [
     'type' => $db_type,
     'user' => $db_config['user'],
     'password' => $db_config['password'],
-    'dbname' => 'xe_install',
+    'dbname' => 'rhymix',
     'port' => ((isset($db_config['port']) && $db_config['port'])?: 3306),
 ];
 foreach($dsn as $piece) {
@@ -27,7 +27,7 @@ if(\Filehandler::exists(_XE_PATH_ . 'config/install.config.php')) {
 }
 
 // Step 1 : License Agreement
-$I->wantTo('Install XE Core');
+$I->wantTo('Install RhymiX');
 $I->amOnPage('/index.php?l=ko');
 $I->setCookie('l', 'ko');
 $I->seeElement('//div[@id="progress"]/ul/li[1][@class="active"]');
@@ -50,7 +50,7 @@ $I->submitForm('#body', [
     'db_userid' => $dbinfo['user'],
     'db_password' => $dbinfo['password'],
     'db_database' => $dbinfo['dbname'],
-    'db_table_prefix' => 'xe'
+    'db_table_prefix' => 'rx'
 ]);
 
 // Step 4 : Create Admin Account