select the right zepto bower repo and exclude jquery

Swiip · Jul 14, 2015 · a29a790 · a29a790
1 parent 6e55985
commit a29a790
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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/');
+    });
   });
 
 });