From b08b20de9777645b30ea5322080dec172e185804 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Fri, 21 Feb 2020 09:50:25 +0000
Subject: [PATCH] Merged importFromGist.js test into gist.js test

---
 test-browser/tests/gist.js           | 44 +++++++++++++++++++++
 test-browser/tests/importFromGist.js | 57 ----------------------------
 2 files changed, 44 insertions(+), 57 deletions(-)
 delete mode 100644 test-browser/tests/importFromGist.js

diff --git a/test-browser/tests/gist.js b/test-browser/tests/gist.js
index d552045284..e365c432c2 100644
--- a/test-browser/tests/gist.js
+++ b/test-browser/tests/gist.js
@@ -1,6 +1,10 @@
 'use strict'
 const init = require('../helpers/init')
 const sauce = require('./sauce')
+const testData = {
+  validGistId: '1859c97c6e1efc91047d725d5225888e',
+  invalidGistId: '6368b389f9302v32902msk2402'
+}
 // 99266d6da54cc12f37f11586e8171546c7700d67
 
 module.exports = {
@@ -37,6 +41,46 @@ module.exports = {
           .perform(done)
       }
     })
+  },
+
+  'Load Gist Modal': function (browser) {
+    browser
+    .waitForElementVisible('#icon-panel', 10000)
+    .clickLaunchIcon('fileExplorers')
+    .scrollAndClick('div.file > div.btn-group > button:nth-child(1)')
+    .waitForElementVisible('h6.modal-title')
+    .assert.containsText('h6.modal-title', 'Load a Gist')
+    .waitForElementVisible('div.modal-body > div')
+    .assert.containsText('div.modal-body > div', 'Enter the ID of the Gist or URL you would like to load.')
+    .waitForElementVisible('#prompt_text')
+    .click('#modal-footer-cancel')
+  },
+
+  'Display Error Message For Invalid Gist ID': function (browser) {
+    browser
+    .waitForElementVisible('#icon-panel', 10000)
+    .clickLaunchIcon('fileExplorers')
+    .scrollAndClick('div.file > div.btn-group > button:nth-child(1)')
+    .waitForElementVisible('#prompt_text')
+    .setValue('#prompt_text', testData.invalidGistId)
+    .modalFooterOKClick()
+    .waitForElementVisible('div.modal-body > div')
+    .assert.containsText('div.modal-body > div', 'Gist load error: Not Found')
+    .modalFooterOKClick()
+  },
+
+  'Import From Gist For Valid Gist ID': function (browser) {
+    browser
+    .waitForElementVisible('#icon-panel', 10000)
+    .clickLaunchIcon('fileExplorers')
+    .scrollAndClick('div.file > div.btn-group > button:nth-child(1)')
+    .waitForElementVisible('#prompt_text')
+    .setValue('#prompt_text', testData.validGistId)
+    .modalFooterOKClick()
+    .switchFile(`browser/gists/${testData.validGistId}`)
+    .switchFile(`browser/gists/${testData.validGistId}/ApplicationRegistry`)
+    .waitForElementVisible(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry']`)
+    .assert.containsText(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry'] > span`, 'ApplicationRegistry')
     .end()
   },
 
diff --git a/test-browser/tests/importFromGist.js b/test-browser/tests/importFromGist.js
deleted file mode 100644
index 67c46bf285..0000000000
--- a/test-browser/tests/importFromGist.js
+++ /dev/null
@@ -1,57 +0,0 @@
-'use strict'
-const init = require('../helpers/init')
-const sauce = require('./sauce')
-
-const testData = {
-  validGistId: '1859c97c6e1efc91047d725d5225888e',
-  invalidGistId: '6368b389f9302v32902msk2402'
-}
-
-module.exports = {
-  before: function (browser, done) {
-    init(browser, done)
-  },
-
-  'Load Gist Modal': function (browser) {
-    browser
-    .waitForElementVisible('#icon-panel', 10000)
-    .clickLaunchIcon('fileExplorers')
-    .scrollAndClick('div.file > div.btn-group > button:nth-child(1)')
-    .waitForElementVisible('h6.modal-title')
-    .assert.containsText('h6.modal-title', 'Load a Gist')
-    .waitForElementVisible('div.modal-body > div')
-    .assert.containsText('div.modal-body > div', 'Enter the ID of the Gist or URL you would like to load.')
-    .waitForElementVisible('#prompt_text')
-    .click('#modal-footer-cancel')
-  },
-
-  'Display Error Message For Invalid Gist ID': function (browser) {
-    browser
-    .waitForElementVisible('#icon-panel', 10000)
-    .clickLaunchIcon('fileExplorers')
-    .scrollAndClick('div.file > div.btn-group > button:nth-child(1)')
-    .waitForElementVisible('#prompt_text')
-    .setValue('#prompt_text', testData.invalidGistId)
-    .modalFooterOKClick()
-    .waitForElementVisible('div.modal-body > div')
-    .assert.containsText('div.modal-body > div', 'Gist load error: Not Found')
-    .modalFooterOKClick()
-  },
-
-  'Import From Gist For Valid Gist ID': function (browser) {
-    browser
-    .waitForElementVisible('#icon-panel', 10000)
-    .clickLaunchIcon('fileExplorers')
-    .scrollAndClick('div.file > div.btn-group > button:nth-child(1)')
-    .waitForElementVisible('#prompt_text')
-    .setValue('#prompt_text', testData.validGistId)
-    .modalFooterOKClick()
-    .switchFile(`browser/gists/${testData.validGistId}`)
-    .switchFile(`browser/gists/${testData.validGistId}/ApplicationRegistry`)
-    .waitForElementVisible(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry']`)
-    .assert.containsText(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry'] > span`, 'ApplicationRegistry')
-    .end()
-  },
-
-  tearDown: sauce
-}