Skip to content

Commit cc9bc66

Browse files
author
jacobscarter
committed
testing travis ci
1 parent 145f080 commit cc9bc66

6 files changed

+82
-49
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ logs
1212
results
1313
lib
1414
node_modules
15+
coverage
1516
components
1617
bower_components
1718
npm-debug.log

.travis.yml

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1-
language: node_js
1+
nguage: node_js
22
node_js:
3-
- "0.10"
3+
- "4.2.4"
44

55
before_script:
6-
- export DISPLAY=:99.0
7-
- sh -e /etc/init.d/xvfb start
6+
- npm install
7+
- npm install -g bower
8+
- npm install -g grunt
9+
10+
script:
11+
- npm test
12+
13+
after_success:
14+
- npm run coveralls
15+
- npm run codacy
16+
17+
notifications:
18+
- email: false
19+
20+
sudo: false

dist/angular-wizard.js

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
/**
2-
* Easy to use Wizard library for AngularJS
3-
* @version v0.8.0 - 2016-09-12 * @link https://github.com/mgonto/angular-wizard
4-
* @author Martin Gontovnikas <[email protected]>
5-
* @license MIT License, http://www.opensource.org/licenses/MIT
6-
*/
7-
angular.module('templates-angularwizard', ['step.html', 'wizard.html']);
8-
9-
angular.module("step.html", []).run(["$templateCache", function($templateCache) {
10-
$templateCache.put("step.html",
11-
"<section ng-show=\"selected\" ng-class=\"{current: selected, done: completed}\" class=\"step\" ng-transclude>\n" +
12-
"</section>");
13-
}]);
14-
15-
angular.module("wizard.html", []).run(["$templateCache", function($templateCache) {
16-
$templateCache.put("wizard.html",
17-
"<div>\n" +
18-
" <div class=\"steps\" ng-if=\"indicatorsPosition === 'bottom'\" ng-transclude></div>\n" +
19-
" <ul class=\"steps-indicator steps-{{getEnabledSteps().length}}\" ng-if=\"!hideIndicators\">\n" +
20-
" <li ng-class=\"{default: !step.completed && !step.selected, current: step.selected && !step.completed, done: step.completed && !step.selected, editing: step.selected && step.completed}\" ng-repeat=\"step in getEnabledSteps()\">\n" +
21-
" <a ng-click=\"goTo(step)\">{{step.title || step.wzTitle}}</a>\n" +
22-
" </li>\n" +
23-
" </ul>\n" +
24-
" <div class=\"steps\" ng-if=\"indicatorsPosition === 'top'\" ng-transclude></div>\n" +
25-
"</div>\n" +
26-
"");
27-
}]);
28-
1+
/**
2+
* Easy to use Wizard library for AngularJS
3+
* @version v0.8.0 - 2016-09-14 * @link https://github.com/mgonto/angular-wizard
4+
* @author Martin Gontovnikas <[email protected]>
5+
* @license MIT License, http://www.opensource.org/licenses/MIT
6+
*/
7+
angular.module('templates-angularwizard', ['step.html', 'wizard.html']);
8+
9+
angular.module("step.html", []).run(["$templateCache", function($templateCache) {
10+
$templateCache.put("step.html",
11+
"<section ng-show=\"selected\" ng-class=\"{current: selected, done: completed}\" class=\"step\" ng-transclude>\n" +
12+
"</section>");
13+
}]);
14+
15+
angular.module("wizard.html", []).run(["$templateCache", function($templateCache) {
16+
$templateCache.put("wizard.html",
17+
"<div>\n" +
18+
" <div class=\"steps\" ng-if=\"indicatorsPosition === 'bottom'\" ng-transclude></div>\n" +
19+
" <ul class=\"steps-indicator steps-{{getEnabledSteps().length}}\" ng-if=\"!hideIndicators\">\n" +
20+
" <li ng-class=\"{default: !step.completed && !step.selected, current: step.selected && !step.completed, done: step.completed && !step.selected, editing: step.selected && step.completed}\" ng-repeat=\"step in getEnabledSteps()\">\n" +
21+
" <a ng-click=\"goTo(step)\">{{step.title || step.wzTitle}}</a>\n" +
22+
" </li>\n" +
23+
" </ul>\n" +
24+
" <div class=\"steps\" ng-if=\"indicatorsPosition === 'top'\" ng-transclude></div>\n" +
25+
"</div>\n" +
26+
"");
27+
}]);
28+
2929
angular.module('mgo-angular-wizard', ['templates-angularwizard']);
30-
30+
3131
angular.module('mgo-angular-wizard').directive('wzStep', function() {
3232
return {
3333
restrict: 'EA',
@@ -55,7 +55,7 @@ angular.module('mgo-angular-wizard').directive('wzStep', function() {
5555
}
5656
};
5757
});
58-
58+
5959
//wizard directive
6060
angular.module('mgo-angular-wizard').directive('wizard', function() {
6161
return {
@@ -411,7 +411,7 @@ angular.module('mgo-angular-wizard').directive('wizard', function() {
411411
};
412412
}]
413413
};
414-
});
414+
});
415415
function wizardButtonDirective(action) {
416416
angular.module('mgo-angular-wizard')
417417
.directive(action, function() {
@@ -438,7 +438,7 @@ wizardButtonDirective('wzPrevious');
438438
wizardButtonDirective('wzFinish');
439439
wizardButtonDirective('wzCancel');
440440
wizardButtonDirective('wzReset');
441-
441+
442442
angular.module('mgo-angular-wizard').factory('WizardHandler', function() {
443443
var service = {};
444444

dist/angular-wizard.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

karma.conf.js

+23-12
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,36 @@ module.exports = function(config) {
1414
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.3/angular.js',
1515
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.3/angular-mocks.js',
1616
'http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js',
17-
'dist/*.min.js',
17+
'src/*.js',
1818
'test/*.js'
1919
],
2020

21-
22-
// list of files to exclude
23-
exclude: [
24-
21+
plugins: [
22+
"karma-phantomjs-launcher",
23+
"karma-jasmine",
24+
"karma-coverage"
2525
],
2626

27+
preprocessors: {
28+
"src/*.js": ["coverage"]
29+
},
30+
31+
// optionally, configure the reporter
32+
coverageReporter: {
33+
dir : "coverage/",
34+
reporters: [
35+
{type: "lcov", subdir: "lcov"}
36+
]
37+
},
2738

2839
// test results reporter to use
29-
// possible values: 'dots', 'progress', 'junit'
30-
reporters: ['progress'],
40+
// possible values: "dots", "progress", "junit"
41+
reporters: ["dots", "coverage"],
3142

43+
// list of files to exclude
44+
exclude: [
45+
46+
],
3247

3348
// web server port
3449
port: 9876,
@@ -59,7 +74,7 @@ module.exports = function(config) {
5974
// - Safari (only Mac)
6075
// - PhantomJS
6176
// - IE (only Windows)
62-
browsers: ['Chrome', 'Firefox'],
77+
browsers: ['PhantomJS'],
6378

6479

6580
// If browser does not capture in given timeout [ms], kill it
@@ -72,9 +87,5 @@ module.exports = function(config) {
7287

7388
};
7489

75-
if (process.env.TRAVIS) {
76-
configuration.browsers = ['Firefox', 'PhantomJS'];
77-
}
78-
7990
config.set(configuration);
8091
};

package.json

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"engines": {
1414
"node": ">= 0.9"
1515
},
16+
"scripts": {
17+
"test": "grunt build",
18+
"coveralls": "cat ./coverage/lcov/lcov.info | coveralls",
19+
"codacy": "cat ./coverage/lcov/lcov.info | codacy-coverage --verbose"
20+
},
1621
"keywords": [
1722
"angular",
1823
"client",
@@ -29,6 +34,8 @@
2934
],
3035
"dependencies": {},
3136
"devDependencies": {
37+
"codacy-coverage": "*",
38+
"coveralls": "*",
3239
"grunt": "~0.4.1",
3340
"grunt-bower": "*",
3441
"grunt-bower-task": "*",
@@ -43,6 +50,7 @@
4350
"grunt-conventional-changelog": "~0.1.1",
4451
"grunt-html2js": "~0.1.3",
4552
"grunt-karma": "~0.9.x",
53+
"karma-coverage": "*",
4654
"grunt-ng-annotate": "^0.6.0",
4755
"grunt-zip": "*",
4856
"jasmine-core": "^2.1.3",

0 commit comments

Comments
 (0)