casper: Use casper.then consistently in realm filters tests.

skapil · Feb 9, 2017 · 4857f3c · 4857f3c
1 parent 26ae2a6
commit 4857f3c
Showing 1 changed file with 32 additions and 20 deletions.
diff --git a/frontend_tests/casper_tests/10-admin.js b/frontend_tests/casper_tests/10-admin.js
@@ -176,38 +176,50 @@ casper.then(function () {
 });
 
 // Test custom realm filters
-casper.waitForSelector('.admin-filter-form', function () {
-    casper.fill('form.admin-filter-form', {
-        pattern: '#(?P<id>[0-9]+)',
-        url_format_string: 'https://trac.example.com/ticket/%(id)s',
+casper.then(function () {
+    casper.waitForSelector('.admin-filter-form', function () {
+        casper.fill('form.admin-filter-form', {
+            pattern: '#(?P<id>[0-9]+)',
+            url_format_string: 'https://trac.example.com/ticket/%(id)s',
+        });
+        casper.click('form.admin-filter-form input.btn');
     });
-    casper.click('form.admin-filter-form input.btn');
 });
 
-casper.waitUntilVisible('div#admin-filter-status', function () {
-    casper.test.assertSelectorHasText('div#admin-filter-status', 'Custom filter added!');
+casper.then(function () {
+    casper.waitUntilVisible('div#admin-filter-status', function () {
+        casper.test.assertSelectorHasText('div#admin-filter-status', 'Custom filter added!');
+    });
 });
 
-casper.waitForSelector('.filter_row', function () {
-    casper.test.assertSelectorHasText('.filter_row span.filter_pattern', '#(?P<id>[0-9]+)');
-    casper.test.assertSelectorHasText('.filter_row span.filter_url_format_string', 'https://trac.example.com/ticket/%(id)s');
-    casper.click('.filter_row button');
+casper.then(function () {
+    casper.waitForSelector('.filter_row', function () {
+        casper.test.assertSelectorHasText('.filter_row span.filter_pattern', '#(?P<id>[0-9]+)');
+        casper.test.assertSelectorHasText('.filter_row span.filter_url_format_string', 'https://trac.example.com/ticket/%(id)s');
+        casper.click('.filter_row button');
+    });
 });
 
-casper.waitWhileSelector('.filter_row', function () {
-    casper.test.assertDoesntExist('.filter_row');
+casper.then(function () {
+    casper.waitWhileSelector('.filter_row', function () {
+        casper.test.assertDoesntExist('.filter_row');
+    });
 });
 
-casper.waitForSelector('.admin-filter-form', function () {
-    casper.fill('form.admin-filter-form', {
-        pattern: 'a$',
-        url_format_string: 'https://trac.example.com/ticket/%(id)s',
+casper.then(function () {
+    casper.waitForSelector('.admin-filter-form', function () {
+        casper.fill('form.admin-filter-form', {
+            pattern: 'a$',
+            url_format_string: 'https://trac.example.com/ticket/%(id)s',
+        });
+        casper.click('form.admin-filter-form input.btn');
     });
-    casper.click('form.admin-filter-form input.btn');
 });
 
-casper.waitUntilVisible('div#admin-filter-pattern-status', function () {
-    casper.test.assertSelectorHasText('div#admin-filter-pattern-status', 'Failed: Invalid filter pattern, you must use the following format OPTIONAL_PREFIX(?P<id>.+)');
+casper.then(function () {
+    casper.waitUntilVisible('div#admin-filter-pattern-status', function () {
+        casper.test.assertSelectorHasText('div#admin-filter-pattern-status', 'Failed: Invalid filter pattern, you must use the following format OPTIONAL_PREFIX(?P<id>.+)');
+    });
 });
 
 var stream_name = "Scotland";