|
@@ -15,8 +15,10 @@ Vue.use(ElementUI)
|
|
|
const PaymentMethods = load(path.resolve('src/ui-refactor/components/PaymentMethods.vue'))
|
|
const PaymentMethods = load(path.resolve('src/ui-refactor/components/PaymentMethods.vue'))
|
|
|
const SignupPage = load(path.resolve('src/ui-refactor/views/welcome-pack/welcomePackModes.js')).default.guest
|
|
const SignupPage = load(path.resolve('src/ui-refactor/views/welcome-pack/welcomePackModes.js')).default.guest
|
|
|
const instances = []
|
|
const instances = []
|
|
|
|
|
+const NG = '620699181539139625'
|
|
|
|
|
+const AE = '620699181539139643'
|
|
|
|
|
|
|
|
-function instance() {
|
|
|
|
|
|
|
+function instance(referrer = 'test-referrer') {
|
|
|
const vm = new Vue({
|
|
const vm = new Vue({
|
|
|
...SignupPage,
|
|
...SignupPage,
|
|
|
beforeCreate() {
|
|
beforeCreate() {
|
|
@@ -27,12 +29,16 @@ function instance() {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
instances.push(vm)
|
|
instances.push(vm)
|
|
|
|
|
+ // 既有报单用例以已验证的推荐人/国家为前置条件;查询及绑定规则由 signupCountry 用例覆盖。
|
|
|
|
|
+ vm.checkedReferrer = referrer
|
|
|
|
|
+ vm.referrerCountryId = NG
|
|
|
|
|
+ vm.form.countryId = NG
|
|
|
|
|
+ vm.form.recUserName = referrer
|
|
|
return vm
|
|
return vm
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async function settle() {
|
|
async function settle() {
|
|
|
- await Promise.resolve()
|
|
|
|
|
- await Promise.resolve()
|
|
|
|
|
|
|
+ for (let i = 0; i < 8; i++) { await Promise.resolve(); await Vue.nextTick() }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
describe('Signup welcome-pack compatibility', () => {
|
|
describe('Signup welcome-pack compatibility', () => {
|
|
@@ -55,12 +61,14 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
[{ ref: '' }, ''],
|
|
[{ ref: '' }, ''],
|
|
|
[{ ref: ' ' }, ''],
|
|
[{ ref: ' ' }, ''],
|
|
|
[{ ref: ['first', 'second'] }, '']
|
|
[{ ref: ['first', 'second'] }, '']
|
|
|
- ])('defaults both network IDs from the invitation query %j without making requests', (query, expected) => {
|
|
|
|
|
|
|
+ ])('prefills both network IDs from the invitation query %j and starts country verification', (query, expected) => {
|
|
|
|
|
+ const verify = jest.fn()
|
|
|
const vm = new Vue({
|
|
const vm = new Vue({
|
|
|
mixins: [registration],
|
|
mixins: [registration],
|
|
|
beforeCreate() {
|
|
beforeCreate() {
|
|
|
this.$route = { query }
|
|
this.$route = { query }
|
|
|
- }
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ methods: { handleChkRecUser: verify }
|
|
|
})
|
|
})
|
|
|
expect(vm.form.recUserName).toBe(expected)
|
|
expect(vm.form.recUserName).toBe(expected)
|
|
|
expect(vm.form.conUserName).toBe(expected)
|
|
expect(vm.form.conUserName).toBe(expected)
|
|
@@ -68,17 +76,18 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
vm.form.conUserName = 'edited-actual-referrer'
|
|
vm.form.conUserName = 'edited-actual-referrer'
|
|
|
expect(vm.form.recUserName).toBe('edited-referrer')
|
|
expect(vm.form.recUserName).toBe('edited-referrer')
|
|
|
expect(vm.form.conUserName).toBe('edited-actual-referrer')
|
|
expect(vm.form.conUserName).toBe('edited-actual-referrer')
|
|
|
- expect(request).not.toHaveBeenCalled()
|
|
|
|
|
|
|
+ if (expected) expect(verify).toHaveBeenCalledWith(false)
|
|
|
|
|
+ else expect(verify).not.toHaveBeenCalled()
|
|
|
vm.$destroy()
|
|
vm.$destroy()
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
it.each([
|
|
it.each([
|
|
|
- ['', 'actual-referrer', 'Please enter the referrer ID.'],
|
|
|
|
|
- [' ', 'actual-referrer', 'Please enter the referrer ID.'],
|
|
|
|
|
|
|
+ ['', 'actual-referrer', 'Please verify the referrer and use their country.'],
|
|
|
|
|
+ [' ', 'actual-referrer', 'Please verify the referrer and use their country.'],
|
|
|
['referrer', '', 'Please enter the actual referrer ID.'],
|
|
['referrer', '', 'Please enter the actual referrer ID.'],
|
|
|
['referrer', ' ', 'Please enter the actual referrer ID.']
|
|
['referrer', ' ', 'Please enter the actual referrer ID.']
|
|
|
])('requires both network IDs before creating an order: %j / %j', (referrer, actualReferrer, message) => {
|
|
])('requires both network IDs before creating an order: %j / %j', (referrer, actualReferrer, message) => {
|
|
|
- const vm = instance()
|
|
|
|
|
|
|
+ const vm = instance(referrer.trim())
|
|
|
Object.assign(vm.form, { decLv: 'level', decUserName: 'center', recUserName: referrer, conUserName: actualReferrer })
|
|
Object.assign(vm.form, { decLv: 'level', decUserName: 'center', recUserName: referrer, conUserName: actualReferrer })
|
|
|
vm.isDec = '0'
|
|
vm.isDec = '0'
|
|
|
vm.draft = { draftId: 'test-draft', accessToken: 'test-only-guest-token' }
|
|
vm.draft = { draftId: 'test-draft', accessToken: 'test-only-guest-token' }
|
|
@@ -96,7 +105,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
vm.form.conUserName = 'previous-referrer'
|
|
vm.form.conUserName = 'previous-referrer'
|
|
|
vm.form.autoPlace = 'previous-placement'
|
|
vm.form.autoPlace = 'previous-placement'
|
|
|
vm.conRealName = 'Previous name'
|
|
vm.conRealName = 'Previous name'
|
|
|
- request.mockResolvedValue({ data: { REAL_NAME: 'Test referrer' }})
|
|
|
|
|
|
|
+ request.mockResolvedValue({ data: { REAL_NAME: 'Test referrer', countryId: NG, allGoods: [], region: [], decLevel: [], payList: [] }})
|
|
|
vm.handleChkRecUser()
|
|
vm.handleChkRecUser()
|
|
|
expect(request).toHaveBeenCalledWith({
|
|
expect(request).toHaveBeenCalledWith({
|
|
|
url: '/v1/user/guest-full-info', method: 'get', params: { userName: 'test-referrer' }
|
|
url: '/v1/user/guest-full-info', method: 'get', params: { userName: 'test-referrer' }
|
|
@@ -106,6 +115,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
expect(vm.conRealName).toBe('-')
|
|
expect(vm.conRealName).toBe('-')
|
|
|
expect(vm.loading).toBe(true)
|
|
expect(vm.loading).toBe(true)
|
|
|
await settle()
|
|
await settle()
|
|
|
|
|
+ jest.runOnlyPendingTimers()
|
|
|
expect(vm.recRealName).toBe('Test referrer')
|
|
expect(vm.recRealName).toBe('Test referrer')
|
|
|
expect(vm.loading).toBe(false)
|
|
expect(vm.loading).toBe(false)
|
|
|
})
|
|
})
|
|
@@ -143,6 +153,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
|
|
|
|
|
it('does not query guest network information for empty referrer IDs', () => {
|
|
it('does not query guest network information for empty referrer IDs', () => {
|
|
|
const vm = instance()
|
|
const vm = instance()
|
|
|
|
|
+ vm.form.recUserName = ''
|
|
|
vm.handleChkRecUser()
|
|
vm.handleChkRecUser()
|
|
|
vm.handleChkRecommenderActualName()
|
|
vm.handleChkRecommenderActualName()
|
|
|
expect(request).not.toHaveBeenCalled()
|
|
expect(request).not.toHaveBeenCalled()
|
|
@@ -158,7 +169,8 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
expect(vm.countriesList).toEqual([
|
|
expect(vm.countriesList).toEqual([
|
|
|
- { ID: '620699181539139625', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: '620713695651307520' }
|
|
|
|
|
|
|
+ { ID: '620699181539139625', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: '620713695651307520' },
|
|
|
|
|
+ { ID: '620699181539139643', NAME: 'UAE', DEFAULT_LANGUAGE_ID: '620713695651307520' }
|
|
|
])
|
|
])
|
|
|
expect(vm.languageList).toEqual([
|
|
expect(vm.languageList).toEqual([
|
|
|
{ ID: '620713695718416384', NAME: '中文' },
|
|
{ ID: '620713695718416384', NAME: '中文' },
|
|
@@ -191,7 +203,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
|
|
|
|
|
it('loads guest identity, member ID, currency and payment methods from the selected country', async() => {
|
|
it('loads guest identity, member ID, currency and payment methods from the selected country', async() => {
|
|
|
const vm = instance()
|
|
const vm = instance()
|
|
|
- vm.form.countryId = 'country'
|
|
|
|
|
|
|
+ vm.form.countryId = NG
|
|
|
const draft = {
|
|
const draft = {
|
|
|
draftId: '90071992547409931234', accessToken: 'test-only-guest-token',
|
|
draftId: '90071992547409931234', accessToken: 'test-only-guest-token',
|
|
|
insertUserName: 'test-guest', currency: 'NGN', expiresAt: 2000000000
|
|
insertUserName: 'test-guest', currency: 'NGN', expiresAt: 2000000000
|
|
@@ -201,7 +213,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
|
|
|
|
|
vm.fetchWelcomePack()
|
|
vm.fetchWelcomePack()
|
|
|
expect(request).toHaveBeenCalledWith({
|
|
expect(request).toHaveBeenCalledWith({
|
|
|
- url: '/v1/user/guest-dec', method: 'get', params: { countryId: 'country' }
|
|
|
|
|
|
|
+ url: '/v1/user/guest-dec', method: 'get', params: { countryId: NG }
|
|
|
})
|
|
})
|
|
|
await settle()
|
|
await settle()
|
|
|
jest.runOnlyPendingTimers()
|
|
jest.runOnlyPendingTimers()
|
|
@@ -220,7 +232,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
[undefined, ['cash', 'pay_stack']]
|
|
[undefined, ['cash', 'pay_stack']]
|
|
|
])('keeps country payment methods selectable for response format %#', async(payList, labels) => {
|
|
])('keeps country payment methods selectable for response format %#', async(payList, labels) => {
|
|
|
const vm = instance()
|
|
const vm = instance()
|
|
|
- vm.form.countryId = 'country'
|
|
|
|
|
|
|
+ vm.form.countryId = NG
|
|
|
const original = JSON.stringify(payList)
|
|
const original = JSON.stringify(payList)
|
|
|
request.mockResolvedValue({ data: {
|
|
request.mockResolvedValue({ data: {
|
|
|
draft: { insertUserName: 'test-guest', currency: 'NGN' },
|
|
draft: { insertUserName: 'test-guest', currency: 'NGN' },
|
|
@@ -287,9 +299,9 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
draft, allGoods: [], region: [], decLevel: [],
|
|
draft, allGoods: [], region: [], decLevel: [],
|
|
|
sellType: [{ sell_type: [{ label: 'pay_stack', name: 'Paystack' }] }]
|
|
sellType: [{ sell_type: [{ label: 'pay_stack', name: 'Paystack' }] }]
|
|
|
}})
|
|
}})
|
|
|
- vm.form.countryId = 'previous'
|
|
|
|
|
|
|
+ vm.form.countryId = NG
|
|
|
vm.countriesChange()
|
|
vm.countriesChange()
|
|
|
- vm.form.countryId = 'current'
|
|
|
|
|
|
|
+ vm.referrerCountryId = vm.form.countryId = AE
|
|
|
vm.countriesChange()
|
|
vm.countriesChange()
|
|
|
await settle()
|
|
await settle()
|
|
|
resolvePrevious({ data: { draft: { draftId: 'previous-draft' }}})
|
|
resolvePrevious({ data: { draft: { draftId: 'previous-draft' }}})
|
|
@@ -336,10 +348,10 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
['pay_stack', true],
|
|
['pay_stack', true],
|
|
|
['paystack', false]
|
|
['paystack', false]
|
|
|
])('preserves order fields and opens the existing payment dialog for %s', async(payType, wrapped) => {
|
|
])('preserves order fields and opens the existing payment dialog for %s', async(payType, wrapped) => {
|
|
|
- const vm = instance()
|
|
|
|
|
|
|
+ const vm = instance('edited-referrer')
|
|
|
vm.draft = { draftId: '90071992547409931234', accessToken: 'test-only-guest-token' }
|
|
vm.draft = { draftId: '90071992547409931234', accessToken: 'test-only-guest-token' }
|
|
|
Object.assign(vm.form, {
|
|
Object.assign(vm.form, {
|
|
|
- decLv: 'level', decUserName: 'center', countryId: 'country', languageId: 'language',
|
|
|
|
|
|
|
+ decLv: 'level', decUserName: 'center', countryId: NG, languageId: 'language',
|
|
|
recUserName: 'edited-referrer', conUserName: 'edited-actual-referrer',
|
|
recUserName: 'edited-referrer', conUserName: 'edited-actual-referrer',
|
|
|
areaSelected: ['province', 'city', 'county'], openBank: 'bank', bankNo: 'account',
|
|
areaSelected: ['province', 'city', 'county'], openBank: 'bank', bankNo: 'account',
|
|
|
bankAddress: 'account name', payType, password: 'test-only', payPassword: 'test-only'
|
|
bankAddress: 'account name', payType, password: 'test-only', payPassword: 'test-only'
|
|
@@ -354,7 +366,7 @@ describe('Signup welcome-pack compatibility', () => {
|
|
|
expect(request).toHaveBeenCalledWith({
|
|
expect(request).toHaveBeenCalledWith({
|
|
|
url: '/v1/user/guest-dec', method: 'post', data: expect.objectContaining({
|
|
url: '/v1/user/guest-dec', method: 'post', data: expect.objectContaining({
|
|
|
draftId: '90071992547409931234', accessToken: 'test-only-guest-token',
|
|
draftId: '90071992547409931234', accessToken: 'test-only-guest-token',
|
|
|
- countryId: 'country', languageId: 'language', province: 'province', city: 'city', county: 'county',
|
|
|
|
|
|
|
+ countryId: NG, languageId: 'language', province: 'province', city: 'city', county: 'county',
|
|
|
openBank: 'bank', bankNo: 'account', bankAddress: 'account name',
|
|
openBank: 'bank', bankNo: 'account', bankAddress: 'account name',
|
|
|
recUserName: 'edited-referrer', conUserName: 'edited-actual-referrer',
|
|
recUserName: 'edited-referrer', conUserName: 'edited-actual-referrer',
|
|
|
goodsId: ['goods'], goodsNum: [2], decType: 'normal', decWay: '2', location: 1, payType
|
|
goodsId: ['goods'], goodsNum: [2], decType: 'normal', decWay: '2', location: 1, payType
|