Skip to content

Commit dbee858

Browse files
committed
tests: bower replaced with npm
1 parent f37a01d commit dbee858

File tree

6 files changed

+13
-19
lines changed

6 files changed

+13
-19
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ before_script:
2525
# Install Nette Tester & Code Checker
2626
- travis_retry composer update --no-interaction --prefer-dist $dependencies
2727
- travis_retry composer create-project nette/code-checker temp/code-checker ~2.5 --no-interaction
28-
- if [ $TRAVIS_PHP_VERSION == "7.0" ]; then npm install -g grunt-cli; cd tests/netteForms; npm install; bower install; cd ../..; fi
28+
- if [ $TRAVIS_PHP_VERSION == "7.0" ]; then npm install -g grunt-cli; cd tests/netteForms; npm install; cd ../..; fi
2929
- if [ $TRAVIS_PHP_VERSION == "7.0" ]; then coverage="-p phpdbg --coverage ./coverage.xml --coverage-src ./src"; fi
3030

3131
after_script:

tests/netteForms/.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"expr" : false, // Tolerate `ExpressionStatement` as Programs.
2424
"forin" : false, // Tolerate `for in` loops without `hasOwnPrototype`.
2525
"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
26-
"latedef" : true, // Prohipit variable use before definition.
26+
"latedef" : false, // Prohipit variable use before definition.
2727
"loopfunc" : true, // Allow functions to be defined within loops.
2828
"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.
2929
"regexp" : true, // Prohibit `.` and `[^...]` in regular expressions.

tests/netteForms/Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
1313
src: '../../src/assets/*.js',
1414
options: {
1515
vendor: [
16-
'bower_components/fixtures/fixtures.js'
16+
'node_modules/js-fixtures/fixtures.js'
1717
],
1818
specs: 'spec/*Spec.js'
1919
}

tests/netteForms/SpecRunner.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="utf-8">
55
<title>Jasmine Spec Runner v2.2.0</title>
66

7-
<link rel="stylesheet" href="bower_components/jasmine/lib/jasmine-core/jasmine.css">
7+
<link rel="stylesheet" href="node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
88

9-
<script src="bower_components/jasmine/lib/jasmine-core/jasmine.js"></script>
10-
<script src="bower_components/jasmine/lib/jasmine-core/jasmine-html.js"></script>
11-
<script src="bower_components/jasmine/lib/jasmine-core/boot.js"></script>
12-
<script src="bower_components/fixtures/fixtures.js"></script>
9+
<script src="node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
10+
<script src="node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
11+
<script src="node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
12+
<script src="node_modules/js-fixtures/fixtures.js"></script>
1313

1414
<script src="../../src/assets/netteForms.js"></script>
1515

tests/netteForms/bower.json

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

tests/netteForms/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"devDependencies": {
3-
"bower": "^1.3.12",
4-
"grunt": "^0.4.5",
5-
"grunt-contrib-jasmine": "^0.8.2",
6-
"grunt-contrib-jshint": "^0.11.0"
3+
"grunt": "^1.0.1",
4+
"grunt-contrib-jasmine": "^1.0.3",
5+
"grunt-contrib-jshint": "^1.0.0",
6+
"jasmine": "^2.5.2",
7+
"js-fixtures": "^1.5.3"
78
}
89
}

0 commit comments

Comments
 (0)