fixed tests

This commit is contained in:
Wyatt Johnson
2017-12-21 14:26:44 -07:00
parent c8ab5cdbf6
commit c2a8a3e4a3
4 changed files with 15 additions and 9 deletions
+2 -1
View File
@@ -6,7 +6,8 @@ import styles from './Drawer.css';
const Drawer = ({children, onClose, className = ''}) => {
return (
<div className={cn(styles.drawer, className)}>
<div className={styles.closeButton} onClick={onClose}>×</div>
{/* TODO: Swap out with button */}
<div className={cn(styles.closeButton, [className, 'close-button'].join('-'))} onClick={onClose}>×</div>
<div className={styles.content}>
{children}
</div>
+6 -3
View File
@@ -7,9 +7,12 @@
// entrypoint for the entire applications configuration.
require('env-rewrite').rewrite();
// Apply all the configuration provided in the .env file if it isn't already
// in the environment.
require('dotenv').config();
if (process.env.NODE_ENV === 'development') {
// Apply all the configuration provided in the .env file if it isn't already
// in the environment.
require('dotenv').config();
}
const uniq = require('lodash/uniq');
const ms = require('ms');
+3 -2
View File
@@ -123,11 +123,12 @@ module.exports = {
userDetailDrawer: {
selector: '.talk-admin-user-detail-drawer',
elements: {
'closeButton': '.talk-admin-user-detail-drawer-close-button',
'tabBar': '.talk-admin-user-detail-tab-bar',
'allTab': '.talk-admin-user-detail-all-tab',
'rejectedTab': '.talk-admin-user-detail-rejected-tab',
'historyTab': '.talk-admin-user-detail-history-tab',
'historyPane': '.talk-admin-user-detail-history-tab-pane',
'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',
'actionsMenu': '.talk-admin-user-detail-actions-button',
+4 -3
View File
@@ -83,7 +83,7 @@ module.exports = {
'admin suspends user': (client) => {
const adminPage = client.page.admin();
const {moderate, userDetailDrawer} = adminPage.section;
adminPage
.navigate()
.ready()
@@ -100,7 +100,7 @@ module.exports = {
.waitForElementVisible('@actionItemSuspendUser')
.click('@actionItemSuspendUser');
adminPage
adminPage
.waitForElementVisible('@suspendUserDialog')
.waitForElementVisible('@suspendUserDialogStep0')
.waitForElementVisible('@suspendUserConfirmButton')
@@ -133,7 +133,8 @@ module.exports = {
.waitForElementVisible('@historyTab')
.click('@historyTab')
.waitForElementVisible('@historyPane')
.waitForElementVisible('@accountHistory');
.waitForElementVisible('@accountHistory')
.click('@closeButton');
},
'admin logs out': (client) => {
const adminPage = client.page.admin();