From d7797da849841905938702f055c5365357cd35a5 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 11 May 2020 17:25:54 +0800
Subject: [PATCH] chore(cli): update tests

---
 .../compiler-app-plus-extra.service.spec.js   |  2 +-
 .../__tests__/compiler-mp-weixin.spec.js      | 36 ++++++++++++++-----
 .../uni-template-compiler/__tests__/demo.js   | 15 +++++++-
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/packages/uni-template-compiler/__tests__/compiler-app-plus-extra.service.spec.js b/packages/uni-template-compiler/__tests__/compiler-app-plus-extra.service.spec.js
index f41b94cce..1d368026f 100644
--- a/packages/uni-template-compiler/__tests__/compiler-app-plus-extra.service.spec.js
+++ b/packages/uni-template-compiler/__tests__/compiler-app-plus-extra.service.spec.js
@@ -172,7 +172,7 @@ describe('codegen', () => {
     )
     assertCodegen(
       '<image src="../static/logo.png"/>',
-      `with(this){return _c('image',{attrs:{"src":_$s(0,'a-src',"/"+require("../static/logo.png")),"_i":0}})}`
+      `with(this){return _c('image',{attrs:{"src":_$s(0,'a-src',require("../static/logo.png")),"_i":0}})}`
     )
     assertCodegen(
       '<image src="@/static/logo.png"/>',
diff --git a/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js b/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
index d8956d8ab..05763b604 100644
--- a/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
+++ b/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
@@ -16,7 +16,7 @@ function assertCodegen (template, templateCode, renderCode = 'with(this){}', opt
     renderCode(res)
   } else {
     expect(res.render).toBe(renderCode)
-  }
+  }
 }
 
 describe('mp:compiler-mp-weixin', () => {
@@ -72,7 +72,7 @@ describe('mp:compiler-mp-weixin', () => {
   })
 
   it('generate scoped slot', () => {
-    assertCodegen(// TODO vue-id
+    assertCodegen( // TODO vue-id
       '<span><slot v-bind:user="user">{{ user.lastName }}</slot></span>',
       '<label class="_span"><block wx:if="{{$slots.default}}"><scoped-slots-default user="{{user}}" bind:__l="__l"></scoped-slots-default></block><block wx:else>{{user.lastName}}</block></label>',
       function (res) {
@@ -86,11 +86,31 @@ describe('mp:compiler-mp-weixin', () => {
         expect(res.componentGenerics['scoped-slots-header']).toBe(true)
       }
     )
-  })
-  it('generate page-meta', () => {
-    assertCodegen(// TODO vue-id
-      '<view><page-meta/><view><button></button></view></view>',
-      '<page-meta vue-id="551070e6-1" bind:__l="__l"></page-meta><view><button></button></view>'
-    )
+  })
+  it('generate page-meta', () => {
+    assertCodegen( // TODO vue-id
+      '<view><page-meta/><view><button></button></view></view>',
+      '<page-meta vue-id="551070e6-1" bind:__l="__l"></page-meta><view><button></button></view>'
+    )
+  })
+
+  it('generate v-slot', () => {
+    assertCodegen(
+      `<view>
+		<slot-comp v-slot:test="{label}">
+			<view>{{label}}</view>
+		</slot-comp>
+		<slot-comp v-slot:test="{label}">
+			<view>{{label}}</view>
+		</slot-comp>
+		<slot-comp v-slot:test="{label}">
+			<view>{{label}}</view>
+		</slot-comp>
+		<slot-comp v-slot:test="{label}">
+			<view class="red">{{label}}</view>
+		</slot-comp>
+	</view>`,
+      '<view><slot-comp generic:scoped-slots-test="test-slot-comp-test" vue-id="551070e6-1" bind:__l="__l" vue-slots="{{[\'test\']}}"></slot-comp><slot-comp generic:scoped-slots-test="test-slot-comp-test1" vue-id="551070e6-2" bind:__l="__l" vue-slots="{{[\'test\']}}"></slot-comp><slot-comp generic:scoped-slots-test="test-slot-comp-test2" vue-id="551070e6-3" bind:__l="__l" vue-slots="{{[\'test\']}}"></slot-comp><slot-comp generic:scoped-slots-test="test-slot-comp-test3" vue-id="551070e6-4" bind:__l="__l" vue-slots="{{[\'test\']}}"></slot-comp></view>'
+    )
   })
 })
diff --git a/packages/uni-template-compiler/__tests__/demo.js b/packages/uni-template-compiler/__tests__/demo.js
index 81e914ea0..0eecf9b90 100644
--- a/packages/uni-template-compiler/__tests__/demo.js
+++ b/packages/uni-template-compiler/__tests__/demo.js
@@ -19,7 +19,20 @@ const scopedPath = path.resolve(__dirname, '../../')
 const compiler = require('../lib')
 const res = compiler.compile(
   `
-<video controls=""/>
+<view>
+		<slot-comp v-slot:test="{label}">
+			<view>{{label}}</view>
+		</slot-comp>
+		<slot-comp v-slot:test="{label}">
+			<view>{{label}}</view>
+		</slot-comp>
+		<slot-comp v-slot:test="{label}">
+			<view>{{label}}</view>
+		</slot-comp>
+		<slot-comp v-slot:test="{label}">
+			<view class="red">{{label}}</view>
+		</slot-comp>
+	</view>
 `, {
     miniprogram: true,
     resourcePath: '/User/fxy/Documents/test.wxml',
-- 
GitLab