wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-09 11:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gdpr-delete

Browse Source
This commit is contained in:
Wyatt Johnson
2018-04-20 10:30:29 -06:00
committed by GitHub
parent 68461308c6 d9a2b10afd
commit e0ebbf5119
19 changed files with 135 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/page_objects/admin.js
+2 -2
View File
@@ -128,8 +128,8 @@ module.exports = {
rejectedTab: '.talk-admin-user-detail-rejected-tab',
historyTab: '.talk-admin-user-detail-history-tab',
historyPane: '.talk-admin-user-detail-history-tab-pane',
accountHistory: '.talk-admin-account-history',
accountHistoryRowStatus: '.talk-admin-account-history-row-status',
UserHistory: '.talk-admin-user-history',
UserHistoryRowStatus: '.talk-admin-user-history-row-status',
actionsMenu: '.talk-admin-user-detail-actions-button',
actionItemSuspendUser: '.action-menu-item#suspendUser',
actionMenuButton:
test/e2e/specs/06_suspendUser.js
+1 -1
View File
@@ -125,7 +125,7 @@ module.exports = {
.waitForElementVisible('@historyTab')
.click('@historyTab')
.waitForElementVisible('@historyPane')
.waitForElementVisible('@accountHistory')
.waitForElementVisible('@UserHistory')
.click('@closeButton');
},
'admin logs out': client => {