diff options
| author | Solly Ross <sross@redhat.com> | 2014-09-19 12:16:06 -0400 |
|---|---|---|
| committer | Solly Ross <sross@redhat.com> | 2014-09-19 12:16:06 -0400 |
| commit | 2c9623b5a73e5ab9b54d462596d1fef0063c9a73 (patch) | |
| tree | ab2798c1ad05ef78a048e89b734dbec139125bf6 /karma.conf.js | |
| parent | f8f95d6023c21c050d37c4e0b1313b70655209c0 (diff) | |
| download | novnc-2c9623b5a73e5ab9b54d462596d1fef0063c9a73.tar.gz | |
Fixed assertion collision issues
When run via karma, all the tests are loaded into the same page.
This was causing a collision in the 'displayed' assertion dealing
with using viewportLoc.
The assertions are now in their own file, pulled in by tests that
need them. Additionally, several tests which only set fb_width
and fb_height were correct to set viewportLoc as well.
Closes #392
Also-Authored-By: Martin André (github: mandre)
Diffstat (limited to 'karma.conf.js')
| -rw-r--r-- | karma.conf.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/karma.conf.js b/karma.conf.js index fca5970..40e21c8 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -109,6 +109,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser (loaded in order) files: [ 'tests/fake.*.js', + 'tests/assertions.js', 'include/util.js', // load first to avoid issues, since methods are called immediately //'../include/*.js', 'include/base64.js', |