Skip to content

Commit

Permalink
(fix) use correct appName and fix gulp script task
Browse files Browse the repository at this point in the history
Put back the templated appName in _package.json to replace it with
user supplied appName. Fix Gulp script task restore JSFilter. Pass
Chrome options in protractor.config.
  • Loading branch information
dustinspecker committed Sep 5, 2014
1 parent 0d8df10 commit 6a1e253
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion app/templates/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ gulp.task('scripts', ['clean', 'analyze', 'markup'], function () {
.pipe($.if(isProd, $.concat('app.js')))
.pipe($.if(isProd, $.ngAnnotate()))
.pipe($.if(isProd, $.uglify()))
.pipe($.if(isProd, $.rev()))<% if (polymer) { %>
.pipe($.if(isProd, $.rev()))
.pipe(jsFilter.restore())<% if (polymer) { %>
.pipe($.addSrc($.mainBowerFiles({filter: /platform/})))<% } %>
.pipe(gulp.dest(buildJs));
});
Expand Down
2 changes: 1 addition & 1 deletion app/templates/_package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "track",
"name": "<%= appName %>",
"version": "0.0.0",
"scripts": {
"test": "gulp test"
Expand Down
5 changes: 4 additions & 1 deletion app/templates/protractor.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
exports.config = {
seleniumServerJar: './node_modules/protractor/selenium/selenium-server-standalone-2.42.2.jar',
capabilities: {
browserName: 'chrome'
browserName: 'chrome',
chromeOptions: {
args: ['--test-type']
}
},

jasmineNodeOpts: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-ng-poly",
"version": "0.2.13",
"version": "0.2.14",
"description": "Yeoman generator for AngularJS apps with optional Polymer support",
"license": "MIT",
"main": "app/index.js",
Expand Down

0 comments on commit 6a1e253

Please sign in to comment.