Skip to content

Commit e49a73c

Browse files
JamesMessingerJamesMessinger
committed
tooling updates
1 parent b8f2e57 commit e49a73c

34 files changed

+254
-245
lines changed

‎.bowerrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "tests/bower_components"
2+
"directory": "www/bower_components"
33
}

‎.eslintrc

Lines changed: 235 additions & 227 deletions
Large diffs are not rendered by default.

‎.yo-rc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"cordova": false
88
},
99
"githubUsername": "BigstickCarpet",
10-
"tests": true
10+
"tests": true,
11+
"es6": false
1112
}
1213
}

‎karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ var baseConfig = {
77
reporters: ['mocha'],
88
files: [
99
// Third-Party Libraries
10-
'tests/bower_components/chai/chai.js',
11-
'tests/bower_components/sinon-js/sinon.js',
10+
'www/bower_components/chai/chai.js',
11+
'www/bower_components/sinon-js/sinon.js',
1212

1313
// Json Schema $Ref Parser
1414
'dist/ref-parser.min.js',

‎package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"build": "npm run lint && npm run browserify",
2525
"browserify": "simplifyify lib/index.js --outfile dist/ref-parser.js --standalone \\$RefParser --debug --minify",
2626
"watch": "npm run browserify -- --watch",
27-
"mocha": "mocha --bail --async-only tests/fixtures tests/specs",
27+
"mocha": "mocha --bail --recursive tests/fixtures tests/specs",
2828
"istanbul": "istanbul cover _mocha --dir coverage/node -- --bail --recursive tests/fixtures tests/specs",
2929
"karma": "karma start --single-run",
3030
"test": "npm run browserify -- --test && npm run istanbul && npm run karma",
@@ -37,15 +37,11 @@
3737
"url": "https://github.com/BigstickCarpet/json-schema-ref-parser.git"
3838
},
3939
"devDependencies": {
40+
"simplifyify": "^1.4.1",
4041
"bower": "^1.5.3",
41-
"chai": "^3.3.0",
42-
"coveralls": "^2.11.4",
43-
"eslint": "^1.5.1",
44-
"istanbul": "^0.3.21",
45-
"jscs": "^2.1.1",
4642
"karma": "^0.13.10",
4743
"karma-chrome-launcher": "^0.2.0",
48-
"karma-cli": "0.1.1",
44+
"karma-cli": "^0.1.1",
4945
"karma-coverage": "^0.5.2",
5046
"karma-firefox-launcher": "^0.1.6",
5147
"karma-ie-launcher": "^0.2.0",
@@ -54,11 +50,15 @@
5450
"karma-phantomjs-launcher": "^0.2.1",
5551
"karma-safari-launcher": "^0.1.1",
5652
"karma-sauce-launcher": "^0.2.14",
57-
"mocha": "^2.3.3",
58-
"npm-check-updates": "^2.2.4",
5953
"phantomjs": "^1.9.18",
60-
"simplifyify": "^1.4.1",
54+
"istanbul": "^0.3.21",
55+
"coveralls": "^2.11.4",
56+
"mocha": "^2.3.3",
57+
"chai": "^3.3.0",
6158
"sinon": "^1.17.1",
59+
"jscs": "^2.2.1",
60+
"eslint": "^1.5.1",
61+
"npm-check-updates": "^2.2.4",
6262
"version-bump-prompt": "^1.5.2"
6363
},
6464
"dependencies": {

‎tests/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
<title>Json Schema Ref Parser Tests</title>
99

10-
<link rel="stylesheet" href="bower_components/mocha/mocha.css"/>
10+
<link rel="stylesheet" href="../www/bower_components/mocha/mocha.css"/>
1111
</head>
1212
<body>
1313
<div id="mocha"></div>
1414

1515
<!-- Third-Party Libraries -->
16-
<script src="bower_components/mocha/mocha.js"></script>
17-
<script src="bower_components/chai/chai.js"></script>
18-
<script src="bower_components/sinon-js/sinon.js"></script>
16+
<script src="../www/bower_components/mocha/mocha.js"></script>
17+
<script src="../www/bower_components/chai/chai.js"></script>
18+
<script src="../www/bower_components/sinon-js/sinon.js"></script>
1919

2020
<!-- Json Schema Ref Parser -->
2121
<script src="../dist/ref-parser.js"></script>

‎tests/bower_components/chai/.bower.json renamed to ‎www/bower_components/chai/.bower.json

File renamed without changes.

‎tests/bower_components/chai/CONTRIBUTING.md renamed to ‎www/bower_components/chai/CONTRIBUTING.md

File renamed without changes.

‎tests/bower_components/chai/History.md renamed to ‎www/bower_components/chai/History.md

File renamed without changes.

‎tests/bower_components/chai/README.md renamed to ‎www/bower_components/chai/README.md

File renamed without changes.

0 commit comments

Comments
 (0)