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

Merge pull request #148 from sharelatex/hof-compile-acceptance-tests

Browse source 
Run acceptance tests on CI
This commit is contained in:
James Allen 2017-11-23 14:47:18 +00:00 committed by GitHub
commit e35356b4a4
4 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/Gruntfile.coffee
View file

@ -39,6 +39,7 @@ module.exports = (grunt) ->
app:
options:
index: "app.js"
logFile: "app.log"
watch:
coffee:
@ -407,7 +408,7 @@ module.exports = (grunt) ->
grunt.registerTask 'compile:unit_tests', 'Compile the unit tests', ['clean:unit_tests', 'coffee:unit_tests']
grunt.registerTask 'compile:acceptance_tests', 'Compile the acceptance tests', ['clean:acceptance_tests', 'coffee:acceptance_tests']
grunt.registerTask 'compile:smoke_tests', 'Compile the smoke tests', ['coffee:smoke_tests']
grunt.registerTask 'compile:tests', 'Compile all the tests', ['compile:smoke_tests', 'compile:unit_tests']
grunt.registerTask 'compile:tests', 'Compile all the tests', ['compile:smoke_tests', 'compile:unit_tests', 'compile:acceptance_tests']
grunt.registerTask 'compile', 'Compiles everything need to run web-sharelatex', ['compile:server', 'compile:client', 'compile:css']
grunt.registerTask 'quickcompile:coffee', 'Compiles only changed coffee files',['newer:coffee']

13
services/web/Jenkinsfile vendored
View file

@ -79,7 +79,7 @@ pipeline {
}
}
steps {
sh 'node_modules/.bin/grunt compile --verbose'
sh 'node_modules/.bin/grunt compile compile:tests --verbose'
// replace the build number placeholder for sentry
sh 'node_modules/.bin/grunt version'
}
@ -117,14 +117,19 @@ pipeline {
}
}
steps {
sh 'env NODE_ENV=development ./node_modules/.bin/grunt test:unit --reporter=tap'
sh 'env NODE_ENV=development ./node_modules/.bin/grunt mochaTest:unit --reporter=tap'
}
}
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'
// This tagged relase of the acceptance test runner is a temporary fix
// to get the acceptance tests working before we move to a
// docker-compose workflow. See:
// https://github.com/sharelatex/web-sharelatex-internal/pull/148
sh 'docker pull sharelatex/sl-acceptance-test-runner:node-6.9-mongo-3.4'
sh 'docker run --rm -v $(pwd):/app --env SHARELATEX_ALLOW_PUBLIC_ACCESS=true sharelatex/sl-acceptance-test-runner:node-6.9-mongo-3.4 || (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"))

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

@ -1,17 +1,24 @@
#! /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
while [ $count -le $max_wait ]
do
if nc -z localhost 3000
then
echo ">> Server Started"
echo ">> Running acceptance tests..."
grunt --no-color mochaTest:acceptance
@ -24,3 +31,10 @@ grunt --no-color forever:app:stop
echo ">> Done"
exit $_test_exit_code
fi
sleep 1
echo -n "."
count=$((count+1))
done
exit 1