github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix acceptance tests

Browse source
This commit is contained in:
Hayden Faulds 2017-11-21 17:04:09 +00:00
parent 5cdddc7d0e
commit e54e2c8328
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/Jenkinsfile vendored
View file

@ -124,7 +124,7 @@ pipeline {
stage('Acceptance Tests') {
steps {
sh 'docker pull sharelatex/acceptance-test-runner'
sh 'docker run --rm -v $(pwd):/app --env SHARELATEX_ALLOW_PUBLIC_ACCESS=true sharelatex/acceptance-test-runner || (cat forever/app.log && false)'
sh 'docker run --rm -v $(pwd):/app --env SHARELATEX_ALLOW_PUBLIC_ACCESS=true fauldsh/sl-acceptance-test-runner:node-6.9 || (cat forever/app.log && false)'
}
}

2
services/web/test/acceptance/coffee/helpers/User.coffee
View file

@ -163,7 +163,7 @@ class User
@request.get {
url: "/register"
}, (err, response, body) =>
return callback(error) if error?
return callback(err) if err?
csrfMatches = body.match("window.csrfToken = \"(.*?)\";")
if !csrfMatches?
return callback(new Error("no csrf token found"))

40
services/web/test/acceptance/scripts/full-test.sh
View file

@ -1,26 +1,40 @@
#! /usr/bin/env bash
# If you're running on OS X, you probably need to manually
# 'rm -r node_modules/bcrypt; npm install bcrypt' inside
# the docker container, before it will start.
# npm rebuild bcrypt
# If you're running on OS X, you probably need to rebuild
# some dependencies in the docker container, before it will start.
#
# npm rebuild --update-binary
echo ">> Starting server..."
grunt --no-color forever:app:start
echo ">> Server started"
echo ">> Waiting for Server"
sleep 5
count=1
max_wait=60
echo ">> Running acceptance tests..."
grunt --no-color mochaTest:acceptance
_test_exit_code=$?
while [ $count -le $max_wait ]
do
if nc -z localhost 3000
then
echo ">> Server Started"
echo ">> Killing server"
echo ">> Running acceptance tests..."
grunt --no-color mochaTest:acceptance
_test_exit_code=$?
grunt --no-color forever:app:stop
echo ">> Killing server"
echo ">> Done"
grunt --no-color forever:app:stop
exit $_test_exit_code
echo ">> Done"
exit $_test_exit_code
fi
sleep 1
echo -n "."
count=$((count+1))
done
exit 1