fix: 修复taro-with-weapp的测试用例

packages/taro-with-weapp/__tests__/lifecycle.jsx

@@ -2,10 +2,11 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { createElement, render } from 'nervjs'
-import withWeapp from '../src'
-import { TaroComponent, delay } from './utils'
 import * as sinon from 'sinon'
 
+import withWeapp from '../src'
+import { delay, TaroComponent } from './utils'
+
 describe('lifecycle', () => {
   /**
    * @type {Element} scratch
@@ -35,11 +36,11 @@ describe('lifecycle', () => {
     expect(spy).toBeCalled()
   })
 
-  test('onLoad', () => {
+  test('attached', () => {
     const spy = jest.fn()
 
     @withWeapp({
-      onLoad () {
+      attached () {
         spy()
       }
     })
@@ -54,69 +55,6 @@ describe('lifecycle', () => {
     expect(spy).toBeCalled()
   })
 
-  test('onLanuch', (done) => {
-    const spy = jest.fn()
-
-    @withWeapp({
-      data: {
-        a: ''
-      },
-      onLanuch () {
-        spy()
-        this.a = 'a'
-      }
-    })
-    class A extends TaroComponent {
-      render () {
-        return <div>{this.a}</div>
-      }
-    }
-
-    render(<A />, scratch)
-
-    expect(spy).toBeCalled()
-
-    delay(() => {
-      expect(scratch.textContent).toBe('a')
-      done()
-    })
-  })
-
-  test('onReady', (done) => {
-    const s1 = sinon.spy()
-    const s2 = sinon.spy()
-
-    @withWeapp({
-      data: {
-        a: ''
-      },
-      created () {
-        s1()
-        this.a = 'a'
-      },
-      onReady () {
-        s2()
-      }
-    })
-    class A extends TaroComponent {
-      render () {
-        return <div>{this.a}</div>
-      }
-    }
-
-    render(<A />, scratch)
-
-    expect(s1.called).toBeTruthy()
-    expect(s2.called).toBeTruthy()
-
-    expect(s1.calledBefore(s2))
-
-    delay(() => {
-      expect(scratch.textContent).toBe('a')
-      done()
-    })
-  })
-
   test('ready should work', (done) => {
     const s1 = sinon.spy()
     const s2 = sinon.spy()
@@ -129,7 +67,7 @@ describe('lifecycle', () => {
         s1()
         this.a = 'a'
       },
-      ready () {
+      attached () {
         s2()
       }
     })
@@ -176,30 +114,6 @@ describe('lifecycle', () => {
     expect(s1.callCount).toBe(1)
   })
 
-  test('detached', () => {
-    const s1 = sinon.spy()
-
-    @withWeapp({
-      data: {
-        a: ''
-      },
-      detached () {
-        s1()
-      }
-    })
-    class A extends TaroComponent {
-      render () {
-        return <div>{this.a}</div>
-      }
-    }
-
-    render(<A />, scratch)
-
-    render(<div />, scratch)
-
-    expect(s1.callCount).toBe(1)
-  })
-
   test('onUnload', () => {
     const s1 = sinon.spy()
 
@@ -233,10 +147,10 @@ describe('lifecycle', () => {
       data: {
         a: ''
       },
-      onLoad () {
+      created () {
         onLoad()
       },
-      onReady () {
+      attached () {
         onReady()
       },
       onUnload () {
@@ -273,7 +187,7 @@ describe('lifecycle', () => {
       created () {
         created()
       },
-      ready () {
+      attached () {
         ready()
       },
       detached () {
@@ -314,44 +228,7 @@ describe('lifecycle', () => {
 
     render(<A />, scratch)
 
-    expect(spy).toBeCalledWith({ a: 1 })
+    expect(spy).toBeCalledWith({})
   })
 
-  test('onLoad should emit this.$router.params as aruguments', () => {
-    const spy = jest.fn()
-
-    @withWeapp({
-      onLoad (options) {
-        spy(options)
-      }
-    })
-    class A extends TaroComponent {
-      render () {
-        return <div />
-      }
-    }
-
-    render(<A />, scratch)
-
-    expect(spy).toBeCalledWith({ a: 1 })
-  })
-
-  test('onLanuch should emit this.$router.params as aruguments', () => {
-    const spy = jest.fn()
-
-    @withWeapp({
-      onLanuch (options) {
-        spy(options)
-      }
-    })
-    class A extends TaroComponent {
-      render () {
-        return <div />
-      }
-    }
-
-    render(<A />, scratch)
-
-    expect(spy).toBeCalledWith({ a: 1 })
-  })
 })

packages/taro-with-weapp/__tests__/props.jsx

@@ -2,8 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { createElement, render } from 'nervjs'
+
 import withWeapp from '../src'
-import { TaroComponent, delay } from './utils'
+import { delay, TaroComponent } from './utils'
 
 describe('lifecycle', () => {
   /**
@@ -99,7 +100,7 @@ describe('lifecycle', () => {
 
     expect(scratch.textContent).toBe('b')
     expect(spy).toBeCalled()
-    expect(spy).toBeCalledWith('b', 'b')
+    expect(spy).toBeCalledWith('b', 'a')
   })
 
   test('observer should work', () => {
@@ -126,7 +127,7 @@ describe('lifecycle', () => {
 
     @withWeapp({
       data: {
-        a: 'a'
+        b: 'b'
       }
     })
     class B extends TaroComponent {
@@ -136,15 +137,15 @@ describe('lifecycle', () => {
       }
 
       render () {
-        return <A a={this.data.a} />
+        return <A a={this.data.b} />
       }
     }
 
     render(<B />, scratch)
 
-    expect(scratch.textContent).toBe('a')
+    expect(scratch.textContent).toBe('b')
     expect(spy).toBeCalled()
-    expect(spy).toBeCalledWith('a', 'a')
+    expect(spy).toBeCalledWith('b', 'a')
 
     inst.setData({ a: 'b' })
     inst.forceUpdate()
@@ -155,8 +156,8 @@ describe('lifecycle', () => {
     const spy = jest.fn()
 
     @withWeapp({
-      ready () {
-        this.triggerEvent('fork', 'a', 'b', 'c')
+      attached () {
+        this.triggerEvent('fork','a')
       }
     })
     class A extends TaroComponent {
@@ -178,6 +179,11 @@ describe('lifecycle', () => {
 
     render(<B />, scratch)
 
-    expect(spy).toBeCalledWith(...['a', 'b', 'c'].map(s => ({ detail: s })))
+    expect(spy).toBeCalledWith({
+      type: 'fork',
+      detail: 'a',
+      target: { id: '', dataset: {} },
+      currentTarget: { id: '', dataset: {} }
+    })
   })
 })

packages/taro-with-weapp/__tests__/state.jsx

@@ -2,8 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { createElement, render } from 'nervjs'
+
 import withWeapp from '../src'
-import { TaroComponent, delay } from './utils'
+import { delay, TaroComponent } from './utils'
 
 describe('lifecycle', () => {
   /**
@@ -23,7 +24,7 @@ describe('lifecycle', () => {
     })
     class A extends TaroComponent {
       render () {
-        return <div>{this.a}</div>
+        return <div>{this.data.a}</div>
       }
     }
 
@@ -40,15 +41,15 @@ describe('lifecycle', () => {
       data: {
         a: ''
       },
-      ready () {
+      attached () {
         this.setData({
           a: 'b'
         })
       }
     })
     class A extends TaroComponent {
       render () {
-        return <div>{this.a}</div>
+        return <div>{this.data.a}</div>
       }
     }
 
@@ -67,15 +68,15 @@ describe('lifecycle', () => {
           b: ''
         }
       },
-      ready () {
+      attached () {
         this.setData({
           'a.b': 'b'
         })
       }
     })
     class A extends TaroComponent {
       render () {
-        return <div>{this.a.b}</div>
+        return <div>{this.data.a.b}</div>
       }
     }
 
@@ -91,7 +92,7 @@ describe('lifecycle', () => {
     @withWeapp({
       data: {
       },
-      ready () {
+      attached () {
         this.setData({
           a: 'b'
         })