Enable browser tests (#1273)

* running browser tests on their own

* Rejig Jenkinsfile

* mods after GS suggestion

* Another jenkinsfile

Jenkinsfile

@@ -26,15 +26,6 @@ elifePipeline {
                         sh "IMAGE_TAG=${commit} docker-compose -f docker-compose.yml -f docker-compose.ci.yml run --rm --name elife-xpub_app_test app npm test"
                     }, 'test', commit)
                 },
-                'test:browser': {
-                    try {
-                        withCommitStatus({
-                            sh "echo Disabled browser tests"
-                        }, 'test:browser', commit)
-                    } finally {
-                        archiveArtifacts artifacts: "build/screenshots/*", allowEmptyArchive: true
-                    }
-                },
                 'test:dependencies': {
                     withCommitStatus({
                         sh "IMAGE_TAG=${commit} docker-compose -f docker-compose.yml -f docker-compose.ci.yml run --rm --name elife-xpub_app_test_dependencies app npm run test:dependencies"
@@ -79,6 +70,18 @@ elifePipeline {
             }
         }
 
+        stage 'Browser Tests', {
+            try {
+                sh "IMAGE_TAG=${commit} docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d postgres"
+                sh "IMAGE_TAG=${commit} docker-compose -f docker-compose.yml -f docker-compose.ci.yml run --rm --name elife-xpub_wait_postgres app bash -c './scripts/wait-for-it.sh postgres:5432'"
+                withCommitStatus({
+                    sh "IMAGE_TAG=${commit} NODE_ENV=production NODE_CONFIG_ENV=test PGDATABASE=test_browser docker-compose -f docker-compose.yml -f docker-compose.ci.yml run -p 10081:10081 --rm --name elife-xpub_app_test_browser app bash -c 'socat -d tcp-listen:10081,reuseaddr,fork tcp:localhost:10080 & npm run test:browser -- --screenshots /tmp/screenshots --screenshots-on-fails'"
+                }, 'test:browser', commit)
+            } finally {
+                sh "IMAGE_TAG=${commit} docker-compose -f docker-compose.yml -f docker-compose.ci.yml down -v"
+            }
+        }
+
         stage 'Push image', {
             sh "docker push elifesciences/elife-xpub:${commit}"
             elifeMainlineOnly {