Test: Refactor test folder

The new E2E CI server is missing project & media files needed to run tests.

-Move test/php/common/ to /test/common/ so both PHP and E2E tests can access them
-Update rsync for E2E tests
-Remove deprecated simpletest lines and protractorConf.*.js files

gulpfile.js

@@ -876,13 +876,13 @@ gulp.task('build-upload', function (cb) {
 
   // For E2E tests, upload test dir to destination
   if (params.dest.includes('e2etest')) {
-    options.src = 'test/app/';
-    options.dest = path.join(params.dest, '/test/app');
+    options.src = 'test/';
+    options.dest = path.join(params.dest, '/test');
 
     execute(
       'rsync -progzlt --chmod=Dug=rwx,Fug=rw,o-rwx ' +
       '--delete-during --stats --rsync-path="sudo rsync" <%= rsh %> ' +
-      '<%= src %> <%= dest %>',
+      '<%= src %> <%= dest %> --exclude php',
       options,
       cb
     );

test/app/setupTestEnvironment.php

@@ -274,7 +274,7 @@
 
     // put a copy of the test file in tmp
     $tmpFilePath = sys_get_temp_dir() . "/CopyOf$fileName";
-    copy(TestPath . "php/common/$fileName", $tmpFilePath);
+    copy(TestPath . "common/$fileName", $tmpFilePath);
 
     $response = LexUploadCommands::uploadAudioFile($testProjectId, 'audio', $tmpFilePath);
 
@@ -294,7 +294,7 @@
 
     // put a copy of the test file in tmp
     $tmpFilePath = sys_get_temp_dir() . "/CopyOf$fileName";
-    copy(TestPath . "php/common/$fileName", $tmpFilePath);
+    copy(TestPath . "common/$fileName", $tmpFilePath);
 
     $response = LexUploadCommands::uploadImageFile($testProjectId, 'sense-image', $tmpFilePath);
 
@@ -328,20 +328,20 @@
     // put mock uploaded zip import (jpg file)
     $fileName = $constants['testMockJpgImportFile']['name'];
     $tmpFilePath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $fileName;
-    copy(TestPath . "php/common/$fileName", $tmpFilePath);
+    copy(TestPath . "common/$fileName", $tmpFilePath);
 
     // put mock uploaded zip import (zip file)
     $fileName = $constants['testMockZipImportFile']['name'];
     $tmpFilePath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $fileName;
-    copy(TestPath . "php/common/$fileName", $tmpFilePath);
+    copy(TestPath . "common/$fileName", $tmpFilePath);
 
     // put mock uploaded audio (png file)
     $fileName = $constants['testMockPngUploadFile']['name'];
     $tmpFilePath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $fileName;
-    copy(TestPath . "php/common/$fileName", $tmpFilePath);
+    copy(TestPath . "common/$fileName", $tmpFilePath);
 
     // put mock uploaded audio (mp3 file)
     $fileName = $constants['testMockMp3UploadFile']['name'];
     $tmpFilePath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $fileName;
-    copy(TestPath . "php/common/$fileName", $tmpFilePath);
+    copy(TestPath . "common/$fileName", $tmpFilePath);
 }

test/php/TestConfig.php

@@ -18,9 +18,9 @@
 define('TestMode', true);
 
 define('TestPath', $rootPath . 'test/');
+define('TestCommonPath', $rootPath . 'test/common/');
 define('TestPhpPath', $rootPath . 'test/php/');
 define('TestLibPath', $rootPath . 'test/lib/');
-define('SimpleTestPath', $rootPath . 'src/vendor/simpletest/simpletest/');
 define('SourcePath', $rootPath . 'src/');
 
 define('SF_DATABASE', 'scriptureforge_test');
@@ -34,4 +34,4 @@
 global $WEBSITE;
 $WEBSITE = Website::get('dev.scriptureforge.org');
 
-require_once TestPhpPath . 'common/MongoTestEnvironment.php';
+require_once TestCommonPath . 'MongoTestEnvironment.php';

test/php/model/languageforge/lexicon/LiftImportZipTest.php

@@ -30,7 +30,7 @@ public function tearDown()
 
     public function testLiftImportMerge_ZipFile_CorrectValues()
     {
-        $zipFilePath = self::$environ->copyTestUploadFile(TestPhpPath . 'common/TestLexProject.zip');
+        $zipFilePath = self::$environ->copyTestUploadFile(TestCommonPath . 'TestLexProject.zip');
         $project = self::$environ->createProject(SF_TESTPROJECT, SF_TESTPROJECTCODE);
 
         $this->assertArrayHasKey('en', $project->inputSystems);
@@ -80,7 +80,7 @@ public function testLiftImportMerge_ZipFile_CorrectValues()
      */
     public function testLiftImportMerge_ZipFileWrongFormat_Exception()
     {
-        copy(TestPhpPath . 'common/TestLexProject.zip', sys_get_temp_dir() . '/TestLexProject.tar.gz');
+        copy(TestCommonPath . 'TestLexProject.zip', sys_get_temp_dir() . '/TestLexProject.tar.gz');
         $zipFilePath = self::$environ->copyTestUploadFile(sys_get_temp_dir() . '/TestLexProject.tar.gz');
         unlink(sys_get_temp_dir() . '/TestLexProject.tar.gz');
         $project = self::$environ->createProject(SF_TESTPROJECT, SF_TESTPROJECTCODE);
@@ -101,7 +101,7 @@ public function testLiftImportMerge_ZipFileWrongFormat_RestoreErrorDisplay()
 
     public function testLiftImportMerge_ZipFileWithDir_CorrectValues()
     {
-        $zipFilePath = self::$environ->copyTestUploadFile(TestPhpPath . 'common/TestLexProjectWithDir.zip');
+        $zipFilePath = self::$environ->copyTestUploadFile(TestCommonPath . 'TestLexProjectWithDir.zip');
         $project = self::$environ->createProject(SF_TESTPROJECT, SF_TESTPROJECTCODE);
 
         $importer = LiftImport::get()->importZip($zipFilePath, $project);
@@ -139,7 +139,7 @@ public function testLiftImportMerge_ZipFileWithDir_CorrectValues()
      */
     public function testLiftImportMerge_ZipFileNoLift_Exception()
     {
-        $zipFilePath = self::$environ->copyTestUploadFile(TestPhpPath . 'common/TestLexNoProject.zip');
+        $zipFilePath = self::$environ->copyTestUploadFile(TestCommonPath . 'TestLexNoProject.zip');
         $project = self::$environ->createProject(SF_TESTPROJECT, SF_TESTPROJECTCODE);
         self::$environ->inhibitErrorDisplay();
 
@@ -158,7 +158,7 @@ public function testLiftImportMerge_ZipFileNoLift_RestoreErrorDisplay()
 
     public function testLiftImportMerge_ZipFile2LiftAndOddFolder_Error()
     {
-        $zipFilePath = self::$environ->copyTestUploadFile(TestPhpPath . 'common/TestLex2ProjectsOddFolder.zip');
+        $zipFilePath = self::$environ->copyTestUploadFile(TestCommonPath . 'TestLex2ProjectsOddFolder.zip');
         $project = self::$environ->createProject(SF_TESTPROJECT, SF_TESTPROJECTCODE);
 
         $importer = LiftImport::get()->importZip($zipFilePath, $project);