|
@@ -82,6 +82,8 @@ module.exports = (grunt) ->
|
|
|
"""
|
|
"""
|
|
|
dockerTests:
|
|
dockerTests:
|
|
|
command: 'docker run -v "$(pwd):/document-updater" --rm --name doc-updater-test sharelatex-docupdater-tests'
|
|
command: 'docker run -v "$(pwd):/document-updater" --rm --name doc-updater-test sharelatex-docupdater-tests'
|
|
|
|
|
+ dockerTests2:
|
|
|
|
|
+ command: 'docker run -v "$(pwd):/app" --rm sl-acceptance-test-runner'
|
|
|
|
|
|
|
|
availabletasks:
|
|
availabletasks:
|
|
|
tasks:
|
|
tasks:
|
|
@@ -144,6 +146,12 @@ module.exports = (grunt) ->
|
|
|
['shell:buildDockerImage', 'shell:dockerTests']
|
|
['shell:buildDockerImage', 'shell:dockerTests']
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
+ grunt.registerTask(
|
|
|
|
|
+ 'test:acceptance:docker2',
|
|
|
|
|
+ "Run acceptance tests inside docker container",
|
|
|
|
|
+ ['shell:dockerTests2']
|
|
|
|
|
+ )
|
|
|
|
|
+
|
|
|
grunt.registerTask 'test:acceptance', 'Run the acceptance tests (use --grep=<regex> for individual tests)', ['compile:acceptance_tests', 'mochaTest:acceptance']
|
|
grunt.registerTask 'test:acceptance', 'Run the acceptance tests (use --grep=<regex> for individual tests)', ['compile:acceptance_tests', 'mochaTest:acceptance']
|
|
|
|
|
|
|
|
grunt.registerTask 'run', "Compile and run the document-updater-sharelatex server", ['compile', 'bunyan', 'execute']
|
|
grunt.registerTask 'run', "Compile and run the document-updater-sharelatex server", ['compile', 'bunyan', 'execute']
|