Making a nightwatch test more stable

Orckestra · Mar 5, 2018 · 264704e · 264704e
1 parent 1d6ccb7
commit 264704e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Website/test/e2e/commands/installLocale.js b/Website/test/e2e/commands/installLocale.js
@@ -13,7 +13,7 @@ InstallLocale.prototype.command = function (language, code) {
 		.clickLabel(language)
 		.assertFieldValue(null, "URL mapping name", code)
 		.clickDialogButton("OK")
-		.waitForElementNotVisible("#mastercover", this.api.globals.timeouts.loading)
+		.waitForDialogClosed(this.api.globals.timeouts.loading)
 		.openTreeNode("Languages")
 		.assertTreeNodeHasChild("Languages", language)
 		.refresh()

diff --git a/Website/test/e2e/commands/uninstallLocale.js b/Website/test/e2e/commands/uninstallLocale.js
@@ -10,10 +10,10 @@ InstallLocale.prototype.command = function (language) {
 		.openTreeNode("Languages")
 		.selectTreeNodeAction(language, "Remove Language")
 		.clickDialogButton("OK")
-		.waitForElementNotVisible("#mastercover", this.api.globals.timeouts.loading)
+		.waitForDialogClosed(this.api.globals.timeouts.loading)
 		.openTreeNode("Languages")
 		.assertTreeNodeHasNoChild("Languages", language)
-		
+
 	return this.client.api;
 };
 

diff --git a/Website/test/e2e/commands/waitForDialogClosed.js b/Website/test/e2e/commands/waitForDialogClosed.js
@@ -0,0 +1,13 @@
+var events = require('events');
+
+function WaitForDialogClosed() {
+	events.EventEmitter.call(this);
+}
+
+WaitForDialogClosed.prototype.command = function (timeout) {
+	timeout = timeout || this.api.globals.timeouts.basic;
+	this.client.api.waitForElementNotVisible("#mastercover", timeout);
+	return this.client.api;
+};
+
+module.exports = WaitForDialogClosed;
diff --git a/Website/test/e2e/suite/website-zip-upload-extract/UploadAndExtractZip.js b/Website/test/e2e/suite/website-zip-upload-extract/UploadAndExtractZip.js
@@ -12,18 +12,20 @@ module.exports = {
 		.selectTreeNodeAction("/", "New Folder")
 		.setFieldValue("Folder name", "ZipTest")
 		.clickDialogButton("OK")
+		.waitForDialogClosed()
 		.selectPerspective("System")
 		.selectTreeNodeAction("ZipTest", "Upload and Extract Zip", "Upload File")
 		.setFileFieldValue("Zip file", require('path').resolve(__dirname + '/test.zip'))
 		.clickDialogButton("OK")
+		.waitForDialogClosed()
 		.openTreeNode("ZipTest")
 		.assertTreeNodeHasChild("ZipTest", "root.txt")
 		.openTreeNode("subdir1")
 		.openTreeNode("subdir2")
 		.assertTreeNodeHasChild("subdir2", "simple.txt")
-
 		.selectTreeNodeAction("ZipTest","Delete Folder")
 		.clickDialogButton("OK")
+		.waitForDialogClosed()
 		.assertTreeNodeHasNoChild("/", "ZipTest")
 	},
 	afterEach: function (browser, done) {