Skip to content

Commit

Permalink
tests: bower replaced with npm
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed Dec 21, 2016
1 parent cb711fe commit 30b4887
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ before_script:
# Install Nette Tester & Code Checker
- travis_retry composer update --no-interaction --prefer-dist $dependencies
- travis_retry composer create-project nette/code-checker code-checker ~2.5 --no-interaction
- if [ $TRAVIS_PHP_VERSION == "5.6" ]; then npm install -g grunt-cli; cd tests/netteForms; npm install; bower install; cd ../..; fi
- if [ $TRAVIS_PHP_VERSION == "5.6" ]; then npm install -g grunt-cli; cd tests/netteForms; npm install; cd ../..; fi

sudo: false

Expand Down
2 changes: 1 addition & 1 deletion tests/netteForms/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"expr" : false, // Tolerate `ExpressionStatement` as Programs.
"forin" : false, // Tolerate `for in` loops without `hasOwnPrototype`.
"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
"latedef" : true, // Prohipit variable use before definition.
"latedef" : false, // Prohipit variable use before definition.
"loopfunc" : true, // Allow functions to be defined within loops.
"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.
"regexp" : true, // Prohibit `.` and `[^...]` in regular expressions.
Expand Down
2 changes: 1 addition & 1 deletion tests/netteForms/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = function(grunt) {
src: '../../src/assets/*.js',
options: {
vendor: [
'bower_components/fixtures/fixtures.js'
'node_modules/js-fixtures/fixtures.js'
],
specs: 'spec/*Spec.js'
}
Expand Down
10 changes: 5 additions & 5 deletions tests/netteForms/SpecRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<meta charset="utf-8">
<title>Jasmine Spec Runner v2.2.0</title>

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

<script src="bower_components/jasmine/lib/jasmine-core/jasmine.js"></script>
<script src="bower_components/jasmine/lib/jasmine-core/jasmine-html.js"></script>
<script src="bower_components/jasmine/lib/jasmine-core/boot.js"></script>
<script src="bower_components/fixtures/fixtures.js"></script>
<script src="node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
<script src="node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
<script src="node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
<script src="node_modules/js-fixtures/fixtures.js"></script>

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

Expand Down
7 changes: 0 additions & 7 deletions tests/netteForms/bower.json

This file was deleted.

9 changes: 5 additions & 4 deletions tests/netteForms/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"devDependencies": {
"bower": "^1.3.12",
"grunt": "^0.4.5",
"grunt-contrib-jasmine": "^0.8.2",
"grunt-contrib-jshint": "^0.11.0"
"grunt": "^1.0.1",
"grunt-contrib-jasmine": "^1.0.3",
"grunt-contrib-jshint": "^1.0.0",
"jasmine": "^2.5.2",
"js-fixtures": "^1.5.3"
}
}

0 comments on commit 30b4887

Please sign in to comment.