Commit 55d469c

committed

APIAuto: 解决回归测试场景串联及切换帐号查看结果时用例与帐号关联错误

1 parent 1420413 commit 55d469cCopy full SHA for 55d469c

File tree

1 file changed

+14

-14

lines changed

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js
- main.js

1 file changed

+14

-14

lines changed

`‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js‎`

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -2588,8 +2588,8 @@ https://github.com/Tencent/APIJSON/issues`
`2588`	`2588`	`for (var i = 0; i < accounts.length; i ++) {`
`2589`	`2589`	`var acc = accounts[i]`
`2590`	`2590`	`if (acc != null && (acc.id == chain.testAccountId \|\| ( acc.baseUrl = testInfo.baseUrl && (`
`2591`		`- (StringUtil.isNotEmpty(item.phone) && acc.phone == testInfo.phone)`
`2592`		`- \|\| (StringUtil.isNotEmpty(item.email) && acc.email == testInfo.email) )`
	`2591`	`+ (StringUtil.isNotEmpty(acc.phone) && acc.phone == testInfo.phone)`
	`2592`	`+ \|\| (StringUtil.isNotEmpty(acc.email) && acc.email == testInfo.email) )`
`2593`	`2593`	`))) {`
`2594`	`2594`	`this.currentAccountIndex = i`
`2595`	`2595`	`acc.isLoggedIn = true`
`@@ -4778,7 +4778,7 @@ https://github.com/Tencent/APIJSON/issues`
`4778`	`4778`	`var hasTests = JSONObject.isEmpty(tests) != true`
`4779`	`4779`	`if (hasTests \|\| this.isChainShow \|\| (reportId != null && reportId >= 0)) {`
`4780`	`4780`
`4781`		`- const lastAccountIndex = this.currentAccountIndex \|\| 0`
	`4781`	`+ const lastAccountIndex = accountIndex \|\| 0`
`4782`	`4782`
`4783`	`4783`	`for (var i = 0; i < allCount; i++) {`
`4784`	`4784`	`var item = testCases[i]`
`@@ -4796,11 +4796,11 @@ https://github.com/Tencent/APIJSON/issues`
`4796`	`4796`	`for (var i = 0; i < accounts.length; i ++) {`
`4797`	`4797`	`var acc = accounts[i]`
`4798`	`4798`	`if (acc != null && (acc.id == chain.testAccountId \|\| ( acc.baseUrl = testInfo.baseUrl && (`
`4799`		`- (StringUtil.isNotEmpty(item.phone) && acc.phone == testInfo.phone)`
`4800`		`- \|\| (StringUtil.isNotEmpty(item.email) && acc.email == testInfo.email) )`
	`4799`	`+ (StringUtil.isNotEmpty(acc.phone) && acc.phone == testInfo.phone)`
	`4800`	`+ \|\| (StringUtil.isNotEmpty(acc.email) && acc.email == testInfo.email) )`
`4801`	`4801`	`))) {`
`4802`	`4802`	`if (! map[chain.testAccountId]) {`
`4803`		`- this.currentAccountIndex = i`
	`4803`	`+ accountIndex = i`
`4804`	`4804`	`acc.isLoggedIn = true`
`4805`	`4805`	`}`
`4806`	`4806`
`@@ -4821,7 +4821,7 @@ https://github.com/Tencent/APIJSON/issues`
`4821`	`4821`	`}`
`4822`	`4822`	`map[chain.testAccountId] = true`
`4823`	`4823`
`4824`		`- this.currentAccountIndex = lastAccountIndex \|\| 0`
	`4824`	`+ accountIndex = lastAccountIndex \|\| 0`
`4825`	`4825`	`curAccount.isLoggedIn = isLoggedIn`
`4826`	`4826`	`}`
`4827`	`4827`
`@@ -5315,7 +5315,7 @@ https://github.com/Tencent/APIJSON/issues`
`5315`	`5315`	`App.allCount = allCount`
`5316`	`5316`	`if (allCount > 0) {`
`5317`	`5317`	`if (! (this.isAllSummaryShow() \|\| this.isCurrentSummaryShow())) {`
`5318`		`- this.showCompare4TestCaseList(show)`
	`5318`	`+ this.showCompare4TestCaseList(show, this.isChainShow)`
`5319`	`5319`	`}`
`5320`	`5320`	`return;`
`5321`	`5321`	`}`
@@ -10921,11 +10921,11 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
`10921`	`10921`	`for (var i = 0; i < accounts.length; i ++) {`
`10922`	`10922`	`var acc = accounts[i]`
`10923`	`10923`	`if (acc != null && (acc.id == chain.testAccountId \|\| ( acc.baseUrl = testInfo.baseUrl && (`
`10924`		`- (StringUtil.isNotEmpty(item.phone) && acc.phone == testInfo.phone)`
`10925`		`- \|\| (StringUtil.isNotEmpty(item.email) && acc.email == testInfo.email) )`
	`10924`	`+ (StringUtil.isNotEmpty(acc.phone) && acc.phone == testInfo.phone)`
	`10925`	`+ \|\| (StringUtil.isNotEmpty(acc.email) && acc.email == testInfo.email) )`
`10926`	`10926`	`))) {`
`10927`	`10927`	`if (! map[chain.testAccountId]) {`
`10928`		`- this.currentAccountIndex = i`
	`10928`	`+// this.currentAccountIndex = i`
`10929`	`10929`	`acc.isLoggedIn = true`
`10930`	`10930`	`}`
`10931`	`10931`
@@ -10947,7 +10947,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
`10947`	`10947`	`map[chain.testAccountId] = true`
`10948`	`10948`	`}`
`10949`	`10949`
`10950`		`- this.currentAccountIndex = lastAccountIndex \|\| 0`
	`10950`	`+// this.currentAccountIndex = lastAccountIndex \|\| 0`
`10951`	`10951`	`curAccount.isLoggedIn = isLoggedIn`
`10952`	`10952`	`}`
`10953`	`10953`
@@ -11882,8 +11882,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
`11882`	`11882`	`for (var i = 0; i < accounts.length; i ++) {`
`11883`	`11883`	`var acc = accounts[i]`
`11884`	`11884`	`if (acc != null && (acc.id == testAccountId \|\| ( acc.baseUrl = testInfo.baseUrl && (`
`11885`		`- (StringUtil.isNotEmpty(item.phone) && acc.phone == testInfo.phone)`
`11886`		`- \|\| (StringUtil.isNotEmpty(item.email) && acc.email == testInfo.email) )`
	`11885`	`+ (StringUtil.isNotEmpty(acc.phone) && acc.phone == testInfo.phone)`
	`11886`	`+ \|\| (StringUtil.isNotEmpty(acc.email) && acc.email == testInfo.email) )`
`11887`	`11887`	`))) {`
`11888`	`11888`	`chain.testAccountId = acc.id`
`11889`	`11889`	`this.currentAccountIndex = i`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 55d469c

File tree

1 file changed

1 file changed

`‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js‎`

0 commit comments