Skip to content

Commit 063281f

Browse files
authored
Merge pull request #69 from wmde/run-tests-in-karma
Added ability to run tests in karma
2 parents acd326d + e1f79d9 commit 063281f

File tree

5 files changed

+68
-14
lines changed

5 files changed

+68
-14
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ php:
55

66
sudo: false
77

8-
env:
9-
- RUNJOB=jshint
10-
11-
script: bash ./build/travis/script.sh
8+
script: npm install && npm test
129

1310
notifications:
1411
irc:

build/travis/script.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

karma.conf.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module.exports = function ( config ) {
2+
config.set( {
3+
frameworks: [ 'qunit' ],
4+
5+
// Order DOES matter, as soon as we have no dependency management in JS
6+
files: [
7+
'node_modules/jquery/dist/jquery.js',
8+
'vendor/data-values/javascript/src/dataValues.js',
9+
'vendor/data-values/javascript/lib/util/util.inherit.js',
10+
'vendor/data-values/javascript/src/DataValue.js',
11+
'src/__namespace.js',
12+
'src/Claim.js',
13+
'src/Entity.js',
14+
'src/Fingerprint.js',
15+
'src/GroupableCollection.js',
16+
'src/Group.js',
17+
'src/Map.js',
18+
'src/MultiTerm.js',
19+
'src/Reference.js',
20+
'src/SiteLink.js',
21+
'src/Snak.js',
22+
'src/Statement.js',
23+
'src/Term.js',
24+
'src/Set.js',
25+
'src/List.js',
26+
'vendor/data-values/javascript/lib/globeCoordinate/globeCoordinate.js',
27+
'vendor/data-values/javascript/lib/globeCoordinate/globeCoordinate.GlobeCoordinate.js',
28+
'vendor/data-values/javascript/src/valueFormatters/valueFormatters.js',
29+
'vendor/data-values/javascript/src/valueParsers/valueParsers.js',
30+
'vendor/data-values/javascript/src/dataValues.js',
31+
'vendor/data-values/javascript/src/*.js',
32+
'vendor/data-values/javascript/src/values/*.js',
33+
'src/*.js',
34+
'tests/*.js'
35+
],
36+
port: 9876,
37+
38+
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
39+
logLevel: config.LOG_INFO,
40+
browsers: [ 'PhantomJS' ]
41+
} );
42+
};

package.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"directories": {
3+
"lib": "src",
4+
"test": "tests"
5+
},
6+
"dependencies": {
7+
"jquery": "^3.2.1"
8+
},
9+
"devDependencies": {
10+
"jshint": "^2.9.4",
11+
"karma": "^1.7.0",
12+
"karma-cli": "^1.0.1",
13+
"karma-phantomjs-launcher": "^1.0.4",
14+
"karma-qunit": "^1.2.1",
15+
"qunitjs": "^2.3.2"
16+
},
17+
"scripts": {
18+
"postinstall": "composer install",
19+
"test": "npm run jshint && npm run run-tests",
20+
"jshint": "jshint --show-non-errors --verbose src/ tests/",
21+
"run-tests": "karma start --single-run"
22+
}
23+
}

src/__namespace.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/**
22
* @ignore
33
*/
4-
wikibase.datamodel = wikibase.datamodel || {};
4+
window.wikibase = window.wikibase || {};
5+
window.wikibase.datamodel = window.wikibase.datamodel || {};

0 commit comments

Comments
 (0)