Skip to content
Permalink
Browse files

Remove protractor from travis + update docs

  • Loading branch information...
Vincent Prouillet
Vincent Prouillet committed Mar 13, 2015
1 parent 91a0540 commit d999db2442ac72fc440e8ff9cccd8348c533c72d
Showing with 12 additions and 21 deletions.
  1. +1 −3 .travis.yml
  2. +10 −9 README.md
  3. +0 −7 gulpfile.js
  4. +1 −2 package.json
@@ -9,8 +9,6 @@ install:
- npm install -g bower
- npm install
- bower install
- npm run gulp webdriver_update
- npm run gulp build
- cd build && python -m SimpleHTTPServer 8001 > /dev/null 2>&1 &
script:
- ./node_modules/karma/bin/karma start --single-run && ./node_modules/protractor/bin/protractor
- ./node_modules/karma/bin/karma start --single-run
@@ -5,10 +5,10 @@
## Goal
This project serves as a starting point for AngularJS projects using Typescript and SASS (it can easily be changed though).

It provides code organisation by feature (see Structure for more details) and a build system ready for development and testing.
It provides code organisation by feature (see Structure for more details) and a build system ready for development and testing.

The build system is using [Gulp](http://gulpjs.com/) instead of the usual Grunt for speed and simplicity (I wrote an [article](http://vincent.is/introducing-people-to-gulp/) introducing it with examples).
The code instead of configuration approach makes it easy to modify things compared to Grunt.
The build system is using [Gulp](http://gulpjs.com/) instead of the usual Grunt for speed and simplicity (I wrote an [article](http://vincent.is/introducing-people-to-gulp/) introducing it with examples).
The code instead of configuration approach makes it easy to modify things compared to Grunt.

So in short you get:

@@ -35,9 +35,10 @@ $ git branch -D master
$ git branch -m master
$ git remote remove origin
$ git remote add origin yourgitrepourl.git
$ sudo npm -g install bower gulp
$ sudo npm -g install bower
$ bower install
$ npm install
$ ./node_modules/.bin/webdriver-manager update
$ gulp
```
You then have 2 options: use docker or use your local installation.
@@ -82,20 +83,20 @@ ng-boilerplate/
|- gulpfile.js
```

This app organisation groups code by feature but not to the point of grouping the templates/tests/css inside it (it's really to change that in the gulpfile if you want to do that though).
This app organisation groups code by feature but not to the point of grouping the templates/tests/css inside it (it's really to change that in the gulpfile if you want to do that though).

Look at the home module present in the boilerplate to see how you can integrate a module in the angular app and don't forget to delete type definition for the controller in types/app/core.ts.
There's also an exemple service and directive.
Look at the home module present in the boilerplate to see how you can integrate a module in the angular app and don't forget to delete type definition for the controller in types/app/core.ts.
There's also an exemple service and directive.


## Tasks
This uses gulp (http://gulpjs.com/) so you can call any of the tasks defined in the gulpfile.
The default one watches over the files and runs the associated tasks when needed and is called like this:
```bash
$ gulp
$ npm run gulp
```

To build the version to distribute, run the following:
```bash
$ gulp build --type dist
$ npm run gulp build --type dist
```
@@ -130,13 +130,6 @@ gulp.task('karma-watch', function () {
return karma.start({autoWatch: true});
});

gulp.task('webdriver_update', plugins.protractor.webdriver_update);

gulp.task('protractor', function () {
return gulp.src(globs.integration)
.pipe(plugins.protractor.protractor({configFile: 'protractor.conf.js'}));
});

gulp.task('browser-sync', function () {
return browserSync({
open: false,
@@ -20,7 +20,6 @@
"gulp-minify-html": "^1.0.1",
"gulp-ng-annotate": "^0.5.2",
"gulp-ng-html2js": "^0.2.0",
"gulp-protractor": "0.0.11",
"gulp-sass": "git://github.com/Keats/gulp-sass",
"gulp-tslint": "^1.4.1",
"gulp-typescript": "^2.3.0",
@@ -36,6 +35,6 @@
"protractor": "^1.4.0",
"sinon": "^1.12.1",
"sinon-chai": "^2.6.0",
"typescript": "^1.3.0"
"typescript": "^1.4.1"
}
}

0 comments on commit d999db2

Please sign in to comment.
You can’t perform that action at this time.