From f2ef76323d1661781394ad0f8d1a5d14b2fe16c4 Mon Sep 17 00:00:00 2001
From: Dan Seripap <daniel@seripap.com>
Date: Sat, 27 Feb 2016 14:06:33 -0500
Subject: [PATCH 1/3] Test for /clear

---
 test/acceptance/app.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/acceptance/app.js b/test/acceptance/app.js
index effde4f..45f828c 100644
--- a/test/acceptance/app.js
+++ b/test/acceptance/app.js
@@ -133,6 +133,24 @@ describe('Darkwire', () => {
 
         });
 
+        describe('/clear', () => {
+
+          before((client, done) => {
+            browser
+            .waitForElementPresent('textarea.inputMessage', 5000)
+            .clearValue('textarea.inputMessage')
+            .setValue('textarea.inputMessage', ['/clear', browser.Keys.RETURN])
+            .waitForElementNotPresent('span.messageBody', 5000, () => {
+              done();
+            });
+          });
+
+          it('Should clear chat buffer', () => {
+            browser.assert.containsText('div.chatArea', '');
+          });
+
+        });
+
       });
 
       describe('Before file transfer: Image: Confirm sending', () => {

From a42c36ad3a2408b4031a61c7d70aae88f86aacf4 Mon Sep 17 00:00:00 2001
From: Alan Friedman <d.alan.friedman@gmail.com>
Date: Sat, 27 Feb 2016 15:13:46 -0500
Subject: [PATCH 2/3] Fix for /clear command test

---
 test/acceptance/app.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/acceptance/app.js b/test/acceptance/app.js
index 45f828c..50b4ece 100644
--- a/test/acceptance/app.js
+++ b/test/acceptance/app.js
@@ -139,14 +139,13 @@ describe('Darkwire', () => {
             browser
             .waitForElementPresent('textarea.inputMessage', 5000)
             .clearValue('textarea.inputMessage')
-            .setValue('textarea.inputMessage', ['/clear', browser.Keys.RETURN])
-            .waitForElementNotPresent('span.messageBody', 5000, () => {
+            .setValue('textarea.inputMessage', ['/clear', browser.Keys.RETURN], () => {
               done();
             });
           });
 
           it('Should clear chat buffer', () => {
-            browser.assert.containsText('div.chatArea', '');
+            browser.waitForElementNotPresent('.messages li', 5000);
           });
 
         });

From ce5585c20e145f3e668eaac4e05f021db1fbe02d Mon Sep 17 00:00:00 2001
From: Alan Friedman <d.alan.friedman@gmail.com>
Date: Sat, 27 Feb 2016 15:20:53 -0500
Subject: [PATCH 3/3] Remove unnecessary code

---
 test/acceptance/app.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/test/acceptance/app.js b/test/acceptance/app.js
index 50b4ece..66c3375 100644
--- a/test/acceptance/app.js
+++ b/test/acceptance/app.js
@@ -21,14 +21,6 @@ describe('Darkwire', () => {
       });
     });
 
-    afterEach((client, done) => {
-      done();
-    });
-
-    beforeEach((client, done) => {
-      done();
-    });
-
     it('Should show welcome modal', () => {
       browser
       .waitForElementVisible('#first-modal', 5000)
@@ -80,7 +72,7 @@ describe('Darkwire', () => {
           });
         });
 
-        it('Should send a message', (client) => {
+        it('Should send a message', () => {
           browser.windowHandles((result) => {
             browser.switchWindow(result.value[0], () => {
               browser