Skip to content

Commit 24322ef

Browse files
committed
gulpfile formatting
1 parent 5eb2e4c commit 24322ef

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

gulpfile.js

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,32 @@ require('laravel-elixir-karma');
1717
*/
1818

1919
elixir(function(mix) {
20+
21+
var livereloadPaths = [
22+
'public/js/vendor.js',
23+
'public/js/partials.js',
24+
'public/js/app.js',
25+
'public/css/vendor.css',
26+
'public/css/app.css'
27+
],
28+
karmaJsDir = [
29+
'public/js/vendor.js',
30+
'node_modules/angular-mocks/angular-mocks.js',
31+
'node_modules/ng-describe/dist/ng-describe.js',
32+
'public/js/partials.js',
33+
'public/js/app.js',
34+
'tests/angular/**/*.spec.js'
35+
];
36+
2037
mix
21-
.bower()
22-
.angular('./angular/')
23-
.ngHtml2Js('./angular/**/*.html')
24-
.less('./angular/**/*.less', 'public/css')
25-
.livereload([
26-
'public/js/vendor.js',
27-
'public/js/partials.js',
28-
'public/js/app.js',
29-
'public/css/vendor.css',
30-
'public/css/app.css'
31-
], {
32-
liveCSS: true
33-
})
38+
.bower()
39+
.angular('./angular/')
40+
.ngHtml2Js('./angular/**/*.html')
41+
.less('./angular/**/*.less', 'public/css')
42+
.livereload(livereloadPaths, {
43+
liveCSS: true
44+
})
3445
.karma({
35-
jsDir:[
36-
'public/js/vendor.js',
37-
'node_modules/angular-mocks/angular-mocks.js',
38-
'node_modules/ng-describe/dist/ng-describe.js',
39-
'public/js/partials.js',
40-
'public/js/app.js',
41-
'tests/angular/**/*.spec.js'
42-
]
46+
jsDir: karmaJsDir
4347
});
44-
45-
//uncomment this for gulp tdd
46-
//.phpUnit();
4748
});

tests/angular/app/components/login-form/login-form.component.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ ngDescribe({
33
modules: 'app',
44
element: '<login-form></login-form>',
55
tests: function (deps) {
6-
6+
77
it('Should have email and password inputs', () => {
8-
var inputs =deps.element.find('input');
8+
var inputs = deps.element.find('input');
99
expect(inputs.length).toBe(2);
1010
var email = deps.element.find('input')[0];
1111
expect(email.attributes['type'].value).toBe('email');
1212
var passsword = deps.element.find('input')[1];
1313
expect(passsword.attributes['type'].value).toBe('password');
1414
});
1515
}
16-
});
16+
});

0 commit comments

Comments
 (0)