fixed ci

Tencent · May 17, 2017 · 443c21d · 443c21d
1 parent 4640f10
commit 443c21d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/packages/wepy/src/base.js b/packages/wepy/src/base.js
@@ -110,19 +110,23 @@ export default {
                 config[name] = app.constructor.prototype[name];
         });
 
-        // config.$app = app;
+        if (arguments.length === 2 && arguments[1] === true) {
+            config.$app = app;
+        }
         app.$wxapp = getApp();
         return config;
     },
     $createPage (pageClass, pagePath) {
         let self = this;
         let config = {}, k;
         let page = new pageClass();
-        if (pagePath)
+        if (typeof pagePath === 'string') {
             this.$instance.$pages[pagePath] = page;
+        }
         page.initMixins();
         // This will be a circum Object
-        // config.$page = page;
+        if ((typeof pagePath === 'boolean' && pagePath) || (arguments.length === 3 && arguments[2] === true))
+            config.$page = page;
 
         config.onLoad = function (...args) {
 

diff --git a/packages/wepy/test/app.js b/packages/wepy/test/app.js
@@ -11,7 +11,7 @@ wxfake.resetGlobal();
 describe('app.js', () => {
 
 
-    let appConfig = wepy.$createApp(App);
+    let appConfig = wepy.$createApp(App, true);
     let app = appConfig.$app;
 
 

diff --git a/packages/wepy/test/base.js b/packages/wepy/test/base.js
@@ -16,13 +16,13 @@ describe('base.js', () => {
     it('create app', () => {
         wxfake.resetGlobal();
 
-        let config = wepy.$createApp(App);
+        let config = wepy.$createApp(App, true);
 
         assert.strictEqual(typeof config.custom, 'function', 'return a app object');
     });
 
     it('create page', () => {
-        let page = wepy.$createPage(Index);
+        let page = wepy.$createPage(Index, true);
 
         page.onLoad.call(wxfake.getWxPage());
 

diff --git a/packages/wepy/test/component.js b/packages/wepy/test/component.js
@@ -20,8 +20,8 @@ describe('component.js', () => {
 
     wxfake.resetGlobal();
 
-    let appConfig = wepy.$createApp(App);
-    let pageConfig = wepy.$createPage(Index);
+    let appConfig = wepy.$createApp(App, true);
+    let pageConfig = wepy.$createPage(Index, true);
     pageConfig.onLoad.call(wxfake.getWxPage());
 
 
@@ -171,8 +171,8 @@ describe('component.js', () => {
     });
 
     it('$invoke', () => {
-        let appConfig = wepy.$createApp(App);
-        let pageConfig = wepy.$createPage(Index);
+        let appConfig = wepy.$createApp(App, true);
+        let pageConfig = wepy.$createPage(Index, true);
 
         let page = pageConfig.$page;
         let app = appConfig.$app;

diff --git a/packages/wepy/test/mixin.js b/packages/wepy/test/mixin.js
@@ -47,8 +47,8 @@ describe('mixin.js', () => {
 
 
     it('mixin function', () => {
-        let appConfig = wepy.$createApp(App);
-        let pageConfig = wepy.$createPage(Index);
+        let appConfig = wepy.$createApp(App, true);
+        let pageConfig = wepy.$createPage(Index, true);
 
         let page = pageConfig.$page;
         let app = appConfig.$app;

diff --git a/packages/wepy/test/page.js b/packages/wepy/test/page.js
@@ -10,12 +10,11 @@ var Page2 = require('./fake/page2');
 var App = require('./fake/app');
 
 
-let appConfig = wepy.$createApp(App);
+let appConfig = wepy.$createApp(App, true);
 wepy.$instance = appConfig.$app;
 
-let pageConfig = wepy.$createPage(Index, 'pages/page1');
-let page2Config = wepy.$createPage(Page2, 'pages/page2');
-
+let pageConfig = wepy.$createPage(Index, 'pages/page1', true);
+let page2Config = wepy.$createPage(Page2, 'pages/page2', true);
 let page = pageConfig.$page;
 let app = appConfig.$app;
 
@@ -67,13 +66,13 @@ describe('page.js', () => {
 
         assert.strictEqual(page instanceof Index, true, 'create a page instance');
 
-        assert.strictEqual(page.isComponent, false, 'page is not a component');
+        assert.strictEqual(page.$isComponent, false, 'page is not a component');
 
     });
 
 
     it('props', () => {
-        let pageConfig = wepy.$createPage(Index);
+        let pageConfig = wepy.$createPage(Index, true);
         let page = pageConfig.$page;
 
         pageConfig.onLoad.call(wxfake.getWxPage());