Merge branch 'upstream-master' into yeoman-generator-1.0

Esri · Jan 5, 2017 · 90097dc · 90097dc
2 parents 6f3036a + f600211
commit 90097dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ sudo: false
 language: node_js
 node_js:
   - 'stable'
+  - 'v7'
+  - 'v6'
+  - 'v5'
   - 'v4'
   - '0.12'
-  - '0.10'
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "url": "https://github.com/tomwayson"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=0.12.0"
   },
   "scripts": {
     "test": "mocha --timeout 10000"

diff --git a/test/test-widget.js b/test/test-widget.js
@@ -892,8 +892,8 @@ describe('esri-appbuilder-js:widget subgenerator', function () {
       .on('end', done);
     });
 
-    it('has wabVersion set to 1.4', function (/*done*/) {
-      assert.fileContent('widgets/TestWidget/manifest.json', /"wabVersion": "1.4",/);
+    it('has wabVersion set to 2.2', function (/*done*/) {
+      assert.fileContent('widgets/TestWidget/manifest.json', /"wabVersion": "2.2",/);
     });
 
     it('has platform set to HTML', function (/*done*/) {
@@ -929,8 +929,8 @@ describe('esri-appbuilder-js:widget subgenerator', function () {
       .on('end', done);
     });
 
-    it('has wabVersion set to 1.4', function (/*done*/) {
-      assert.fileContent('widgets/TestWidget/manifest.json', /"wabVersion": "1.4"/);
+    it('has wabVersion set to 2.2', function (/*done*/) {
+      assert.fileContent('widgets/TestWidget/manifest.json', /"wabVersion": "2.2"/);
     });
 
     it('has platform set to HTML', function (/*done*/) {

diff --git a/widget/index.js b/widget/index.js
@@ -139,7 +139,7 @@ module.exports = Generator.extend({
         this.wabVersion = '2.0beta';
       } else {
         this.platform = 'HTML';
-        this.wabVersion = '1.4';
+        this.wabVersion = '2.2';
         this.is2d = true;
       }