Skip to content

Commit 41c9d1e

Browse files
committed
tests(*): fix travis CI error and get rid of grunt
1 parent 6ea4a06 commit 41c9d1e

File tree

6 files changed

+57
-19
lines changed

6 files changed

+57
-19
lines changed

.travis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: node_js
2+
node_js:
3+
- "0.10"
4+
5+
before_script:
6+
- export CHROME_BIN=chromium-browser
7+
- export DISPLAY=:99.0
8+
- sh -e /etc/init.d/xvfb start
9+
- npm install --quiet -g grunt-cli karma-cli bower
10+
- npm install
11+
- bower install --force-latest
12+
13+
script:
14+
- karma start karma.conf.js

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Drag and Drop for AngularJS (with Animation)
1+
#Drag and Drop for AngularJS (with Animation) [![Build Status](https://api.travis-ci.org/codef0rmer/angular-dragdrop.svg?branch=master)](https://travis-ci.org/codef0rmer/angular-dragdrop)
22

33
---
44

@@ -66,9 +66,10 @@ angular.module('myApp', ['ngDragDrop'])
6666
##How to Contribute
6767
* $ git clone https://github.com/codef0rmer/angular-dragdrop.git
6868
* $ cd angular-dragdrop
69+
* $ npm install --quiet -g karma-cli bower
6970
* $ sudo npm install
70-
* $ sudo bower install
71-
* $ grunt karma
71+
* $ sudo bower install --force-latest
72+
* $ npm test
7273

7374
##Demo
7475
Demo is [here](http://codef0rmer.github.io/angular-dragdrop/#/)

bower.json

+3
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@
2222
"devDependencies": {
2323
"angular-mocks": "~1.x",
2424
"angular-ui-bootstrap-bower": "~0.12.0"
25+
},
26+
"resolutions": {
27+
"angular": "1.3.15"
2528
}
2629
}

karma.conf.js

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
module.exports = function(config) {
2+
var configuration = {
3+
basePath: '',
4+
frameworks: ['jasmine'],
5+
files: [
6+
'components/jquery/dist/jquery.js',
7+
'components/jquery-ui/jquery-ui.min.js',
8+
'components/angular/angular.js',
9+
'components/angular-mocks/angular-mocks.js',
10+
'src/angular-dragdrop.js',
11+
'test/spec/*.js'
12+
],
13+
singleRun: true,
14+
browsers: ['Chrome'],
15+
customLaunchers: {
16+
Chrome_travis_ci: {
17+
base: 'Chrome',
18+
flags: ['--no-sandbox']
19+
}
20+
}
21+
};
22+
23+
if(process.env.TRAVIS){
24+
configuration.browsers = ['Chrome_travis_ci'];
25+
}
26+
27+
config.set(configuration);
28+
};

package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
"main": "src/angular-dragdrop.js",
99
"dependencies": {},
1010
"devDependencies": {
11-
"grunt": "^0.4.5",
12-
"grunt-karma": "^0.4.6"
11+
"jasmine-core": "^2.2.0",
12+
"karma": "^0.12.31",
13+
"karma-chrome-launcher": "^0.1.7",
14+
"karma-jasmine": "^0.3.5"
15+
},
16+
"scripts": {
17+
"test": "npm run test-unit",
18+
"test-unit": "karma start karma.conf.js"
1319
},
14-
"scripts": {},
1520
"repository": {
1621
"type": "git",
1722
"url": "git://github.com/codef0rmer/angular-dragdrop.git"

test/test.conf.js

-13
This file was deleted.

0 commit comments

Comments
 (0)