Skip to content

Commit 0bf2427

Browse files
davidlgjdavidlgj
committed
Migrated gulp tasks and protractor tests
1 parent e497e3a commit 0bf2427

File tree

14 files changed

+277
-42
lines changed

14 files changed

+277
-42
lines changed

‎examples/bootstrap-example.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,13 @@ <h3>Schema</h3>
203203
<script type="text/javascript" src="../bower_components/ace-builds/src-min-noconflict/ace.js"></script>
204204
<script type="text/javascript" src="../bower_components/angular/angular.js"></script>
205205
<script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
206-
<!--
206+
207207
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>
208208
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/2.2.0/ZeroClipboard.min.js"></script>
209209
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ng-clip/0.2.6/ng-clip.min.js"></script>
210210
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
211211
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap.min.js"></script>
212-
-->
212+
213213
<!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular.min.js"></script> -->
214214
<!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular-sanitize.min.js"></script> -->
215215

@@ -282,7 +282,7 @@ <h3>Schema</h3>
282282
$scope.selectedTest = $scope.tests[0];
283283
});
284284
} else {
285-
$scope.selectedTest = $scope.tests[4];
285+
$scope.selectedTest = $scope.tests[0];
286286
}
287287

288288
$scope.$watch('selectedTest',function(val){

‎examples/custom-validators.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ <h3>Demo of custom validators, async validators and parsers</h3>
2424

2525
<script type="text/javascript" src="../bower_components/objectpath/lib/ObjectPath.js"></script>
2626

27-
<script type="text/javascript" src="../dist/schema-form.js"></script>
28-
<script type="text/javascript" src="../dist/bootstrap-decorator.min.js"></script>
27+
<script type="text/javascript" src="../bower_components/angular-schema-form/dist/schema-form.js"></script>
28+
<script type="text/javascript" src="../bootstrap-decorator.js"></script>
2929

3030
<script>
3131
angular.module('test', ['schemaForm']).controller('TestCtrl', function($scope, $q, $timeout) {

‎gulp/index.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
var fs = require('fs'),
2+
tasks = fs.readdirSync('./gulp/tasks'),
3+
gulp = require('gulp');
4+
5+
tasks.forEach(function(task) {
6+
require('./tasks/' + task);
7+
});

‎gulp/tasks/bootstrap-datepicker.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
var gulp = require('gulp'),
2+
streamqueue = require('streamqueue'),
3+
minifyHtml = require('gulp-minify-html'),
4+
templateCache = require('gulp-angular-templatecache'),
5+
concat = require('gulp-concat'),
6+
uglify = require('gulp-uglify');
7+
8+
gulp.task('bootstrap-datepicker', function() {
9+
var stream = streamqueue({objectMode: true});
10+
stream.queue(
11+
gulp.src('./src/directives/decorators/bootstrap/datepicker/*.html')
12+
.pipe(minifyHtml({
13+
empty: true,
14+
spare: true,
15+
quotes: true
16+
}))
17+
.pipe(templateCache({
18+
module: 'schemaForm',
19+
root: 'directives/decorators/bootstrap/datepicker/'
20+
}))
21+
);
22+
stream.queue(gulp.src('./src/directives/decorators/bootstrap/datepicker/*.js'));
23+
24+
stream.done()
25+
.pipe(concat('bootstrap-datepicker.min.js'))
26+
.pipe(uglify())
27+
.pipe(gulp.dest('./dist/'));
28+
29+
});

‎gulp/tasks/default.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
var gulp = require('gulp');
2+
3+
gulp.task('default', [
4+
'minify'
5+
]);

‎gulp/tasks/jscs.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
var gulp = require('gulp'),
2+
jscs = require('gulp-jscs');
3+
4+
gulp.task('jscs', function() {
5+
gulp.src('./src/**/*.js')
6+
.pipe(jscs());
7+
});

‎gulp/tasks/minify.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
var gulp = require('gulp'),
2+
streamqueue = require('streamqueue'),
3+
minifyHtml = require('gulp-minify-html'),
4+
templateCache = require('gulp-angular-templatecache'),
5+
concat = require('gulp-concat'),
6+
rename = require('gulp-rename'),
7+
uglify = require('gulp-uglify');
8+
9+
gulp.task('minify', function() {
10+
var stream = streamqueue({objectMode: true});
11+
stream.queue(
12+
gulp.src('./src/**/*.html')
13+
.pipe(minifyHtml({
14+
empty: true,
15+
spare: true,
16+
quotes: true
17+
}))
18+
.pipe(templateCache({
19+
module: 'schemaForm',
20+
root: 'decorators/bootstrap/'
21+
}))
22+
);
23+
stream.queue(gulp.src('./src/**/*.js'));
24+
25+
stream.done()
26+
.pipe(concat('bootstrap-decorator.js'))
27+
.pipe(gulp.dest('./'))
28+
.pipe(uglify())
29+
.pipe(rename('bootstrap-decorator.min.js'))
30+
.pipe(gulp.dest('./'));
31+
32+
});

‎gulp/tasks/protractor.js‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
var gulp = require('gulp');
2+
3+
// The protractor task
4+
var protractor = require('gulp-protractor');
5+
6+
// Start a standalone server
7+
var webdriver_standalone = protractor.webdriver_standalone;
8+
9+
// Download and update the selenium driver
10+
var webdriver_update = protractor.webdriver_update;
11+
12+
// Downloads the selenium webdriver
13+
gulp.task('webdriver-update', webdriver_update);
14+
15+
// Start the standalone selenium server
16+
// NOTE: This is not needed if you reference the
17+
// seleniumServerJar in your protractor.conf.js
18+
gulp.task('webdriver-standalone', webdriver_standalone);
19+
20+
21+
// Setting up the test task
22+
gulp.task('protractor', ['webdriver-update'], function(cb) {
23+
gulp.src(['test/protractor/specs/**/*.js']).pipe(protractor.protractor({
24+
configFile: 'test/protractor/conf.js',
25+
})).on('error', function(e) {
26+
console.log(e);
27+
}).on('end', cb);
28+
});
29+
30+
['validation-messages', 'custom-validation'].forEach(function(name) {
31+
gulp.task('protractor:' + name, ['webdriver-update'], function(cb) {
32+
gulp.src(['test/protractor/specs/' + name + '.js']).pipe(protractor.protractor({
33+
configFile: 'test/protractor/conf.js',
34+
})).on('error', function(e) {
35+
console.log(e);
36+
}).on('end', cb);
37+
});
38+
});

‎gulp/tasks/watch.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
var gulp = require('gulp');
2+
3+
gulp.task('watch', function() {
4+
gulp.watch('./src/**/*', ['default']);
5+
});

‎gulpfile.js‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,5 @@
1-
var gulp = require('gulp'),
2-
streamqueue = require('streamqueue'),
3-
minifyHtml = require('gulp-minify-html'),
4-
templateCache = require('gulp-angular-templatecache'),
5-
concat = require('gulp-concat'),
6-
rename = require('gulp-rename'),
7-
uglify = require('gulp-uglify');
81

9-
gulp.task('build', function() {
10-
var stream = streamqueue({objectMode: true});
11-
stream.queue(
12-
gulp.src('./src/**/*.html')
13-
.pipe(minifyHtml({
14-
empty: true,
15-
spare: true,
16-
quotes: true
17-
}))
18-
.pipe(templateCache({
19-
module: 'schemaForm',
20-
root: 'decorators/bootstrap/'
21-
}))
22-
);
23-
stream.queue(gulp.src('./src/**/*.js'));
2+
//all of the tasks themselves are contained in the gulp/tasks directory,
3+
//which is accessed through gulp/index.js
244

25-
stream.done()
26-
.pipe(concat('bootstrap-decorator.js'))
27-
.pipe(gulp.dest('./'))
28-
.pipe(uglify())
29-
.pipe(rename('bootstrap-decorator.min.js'))
30-
.pipe(gulp.dest('./'));
31-
32-
});
33-
34-
35-
gulp.task('watch', function() {
36-
gulp.watch('./src/**/*', ['default']);
37-
});
38-
39-
gulp.task('default', ['build']);
5+
require('./gulp');

0 commit comments

Comments
 (0)