Commit 9b086ba2 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'feature-c/2899-wait-end-unit-tests' into 'dev'

Wait for the end of the unit client tests

Closes #2899

See merge request !131
parents 932e1eb1 ecb9652f
Pipeline #11584 failed with stages
in 17 seconds
...@@ -8,7 +8,9 @@ var uri = 'file://' + curdir; ...@@ -8,7 +8,9 @@ var uri = 'file://' + curdir;
nightmare nightmare
.on('console', function(){ console.log(arguments[1]) }) .on('console', function(){ console.log(arguments[1]) })
.goto(uri+"/test_Qunit.html") .goto(uri+"/test_Qunit.html")
.wait('#qunit-testresult-display') .wait(function() {
return $('.qunit-fail').length > 0 || $('.qunit-pass').length > 0;
})
.evaluate(function () { .evaluate(function () {
return tap_output; return tap_output;
}) })
......
...@@ -28,7 +28,7 @@ QUnit.test("shortcuts on scatterplot", function(assert) { ...@@ -28,7 +28,7 @@ QUnit.test("shortcuts on scatterplot", function(assert) {
assert.equal(sp.splitX, sp.AXIS_GENE_V) assert.equal(sp.splitX, sp.AXIS_GENE_V)
shortcut.checkKey(keyMock({'keyCode': 52})) // Preset 4 shortcut.checkKey(keyMock({'keyCode': 52})) // Preset 4
assert.equal(sp.splitX, 'consensusLength') assert.equal(sp.splitX, 'averageLength')
assert.equal(shortcut.system_shortcuts[76][0], "IGL", "System shortcut for IGL") assert.equal(shortcut.system_shortcuts[76][0], "IGL", "System shortcut for IGL")
assert.equal(m.system_selected.length, 2, "We have 2 systems, TRG and IGH") assert.equal(m.system_selected.length, 2, "We have 2 systems, TRG and IGH")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment