From a32e2b4c6f83f59a9545beec09530e1e3958644d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 1 Jan 2020 18:25:34 +0100
Subject: [PATCH] Addressbook -> Contacts

---
 .../{Addressbook/Addressbook.php => Contacts/Contacts.php}  | 4 ++--
 tests/Browser/{Addressbook => Contacts}/Import.php          | 2 +-
 tests/Browser/Settings/Preferences/General.php              | 4 ++--
 tests/Browser/phpunit.xml                                   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/Browser/{Addressbook/Addressbook.php => Contacts/Contacts.php} (96%)
 rename tests/Browser/{Addressbook => Contacts}/Import.php (99%)

diff --git a/tests/Browser/Addressbook/Addressbook.php b/tests/Browser/Contacts/Contacts.php
similarity index 96%
rename from tests/Browser/Addressbook/Addressbook.php
rename to tests/Browser/Contacts/Contacts.php
index 9605ee126..76aef1750 100644
--- a/tests/Browser/Addressbook/Addressbook.php
+++ b/tests/Browser/Contacts/Contacts.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Browser\Addressbook;
+namespace Tests\Browser\Contacts;
 
-class Addressbook extends \Tests\Browser\DuskTestCase
+class Contacts extends \Tests\Browser\DuskTestCase
 {
     protected function setUp()
     {
diff --git a/tests/Browser/Addressbook/Import.php b/tests/Browser/Contacts/Import.php
similarity index 99%
rename from tests/Browser/Addressbook/Import.php
rename to tests/Browser/Contacts/Import.php
index f49e30530..d7530a1fb 100644
--- a/tests/Browser/Addressbook/Import.php
+++ b/tests/Browser/Contacts/Import.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Browser\Addressbook;
+namespace Tests\Browser\Contacts;
 
 class Import extends \Tests\Browser\DuskTestCase
 {
diff --git a/tests/Browser/Settings/Preferences/General.php b/tests/Browser/Settings/Preferences/General.php
index ded645869..34a140a3b 100644
--- a/tests/Browser/Settings/Preferences/General.php
+++ b/tests/Browser/Settings/Preferences/General.php
@@ -23,12 +23,12 @@ class General extends \Tests\Browser\DuskTestCase
             $browser->assertVisible('#sections-table tr.general.focused');
 
             $browser->withinFrame('#preferences-frame', function ($browser) {
+                $browser->waitFor('.formbuttons button.submit');
+
                 // check task and action
                 $this->assertEnvEquals('task', 'settings');
                 $this->assertEnvEquals('action', 'edit-prefs');
 
-                $browser->assertVisible('.formbuttons button.submit');
-
                 // Main Options fieldset
                 $browser->with('form.propform fieldset.main', function ($browser) {
                     $browser->assertSeeIn('legend', 'Main Options');
diff --git a/tests/Browser/phpunit.xml b/tests/Browser/phpunit.xml
index a7683d948..77a041b95 100644
--- a/tests/Browser/phpunit.xml
+++ b/tests/Browser/phpunit.xml
@@ -6,9 +6,9 @@
             <file>Login.php</file>
             <file>Logout.php</file>
         </testsuite>
-        <testsuite name="Addressbook">
-            <file>Addressbook/Addressbook.php</file>
-            <file>Addressbook/Import.php</file>
+        <testsuite name="Contacts">
+            <file>Contacts/Contacts.php</file>
+            <file>Contacts/Import.php</file>
         </testsuite>
         <testsuite name="Settings">
             <file>Settings/Settings.php</file>