From a29a790c176021ff36602e41eda473fed58a6e3d Mon Sep 17 00:00:00 2001 From: Matthieu Lux Date: Tue, 14 Jul 2015 16:15:04 +0200 Subject: [PATCH] select the right zepto bower repo and exclude jquery --- app/src/bower.js | 2 +- app/templates/_bower.json | 2 +- test/node/test-bower.js | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/bower.js b/app/src/bower.js index ae300945..1572f45e 100644 --- a/app/src/bower.js +++ b/app/src/bower.js @@ -50,7 +50,7 @@ module.exports = function(GulpAngularGenerator) { */ GulpAngularGenerator.prototype.computeWiredepExclusions = function computeWiredepExclusions() { this.wiredepExclusions = []; - if (this.props.jQuery.key === 'none') { + if (this.props.jQuery.key === 'none' || this.props.jQuery.key === 'zepto') { this.wiredepExclusions.push('/jquery/'); } if (this.props.ui.key === 'bootstrap') { diff --git a/app/templates/_bower.json b/app/templates/_bower.json index ff38c033..6d38c364 100644 --- a/app/templates/_bower.json +++ b/app/templates/_bower.json @@ -17,7 +17,7 @@ <% } if (props.jQuery.key === 'jquery2') { -%> "jquery": "~2.1.4", <% } if (props.jQuery.key === 'zepto') { -%> - "zeptojs": "~1.1.6", + "zepto": "~1.1.6", <% } if (props.resource.key === 'angular-resource') { -%> "angular-resource": "<%- props.angularVersion %>", <% } if (props.resource.key === 'restangular') { -%> diff --git a/test/node/test-bower.js b/test/node/test-bower.js index 75cb39f3..cd40c589 100644 --- a/test/node/test-bower.js +++ b/test/node/test-bower.js @@ -174,6 +174,17 @@ describe('gulp-angular generator bower script', function () { generator.computeWiredepExclusions(); generator.wiredepExclusions[0].should.be.equal('/jquery/'); }); + + it('should exclude jQuery with Zepto', function() { + generator.props = { + jQuery: { key: 'zepto' }, + ui: { key: 'foundation' }, + foundationComponents: { key: 'official' }, + cssPreprocessor: { key: 'none' } + }; + generator.computeWiredepExclusions(); + generator.wiredepExclusions[0].should.be.equal('/jquery/'); + }); }); });