Merge branch '11.x' of https://github.com/SU-SWS/stanford_profile int…

…o 10.x
SU-SWS · Oct 24, 2023 · cab64fb · cab64fb
2 parents 513a8a4 + 78a15a5
commit cab64fb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -215,6 +215,10 @@ _Release Date: 2022-08-11_
 
 - Fixed events importer title property.
 
+11.0.4
+-------------------------------------------------------------------------------
+- D8CORE-7051 Use display field copy instead of token fields
+
 11.0.3
 -------------------------------------------------------------------------------
 - Next site settings and config ignores (#735)

diff --git a/tests/codeception/acceptance/Content/SearchBlockCest.php b/tests/codeception/acceptance/Content/SearchBlockCest.php
@@ -40,7 +40,7 @@ public function testHideSearchBlock(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Organization', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
     $I->click('Save');
     // The settings might have been created or updated.
     $I->see('Site Settings has been', '.messages-list');

diff --git a/tests/codeception/acceptance/SystemSiteConfigCest.php b/tests/codeception/acceptance/SystemSiteConfigCest.php
@@ -51,7 +51,7 @@ public function testBasicSiteSettings(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Organization', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
 
@@ -104,7 +104,7 @@ public function testSitePages(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Organization', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
 
@@ -141,7 +141,7 @@ protected function experimentalTestGoogleAnalytics(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Org Code', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
 
     $I->click('Save');
     $I->canSee('1 error has been found: Google Analytics Account');

diff --git a/tests/codeception/functional/Contrib/ExtLinkCest.php b/tests/codeception/functional/Contrib/ExtLinkCest.php
@@ -64,7 +64,7 @@ public function testExtLink(FunctionalTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Org Code', $org_term->id());
+    $I->selectOption('.js-form-item-su-site-org-0-target-id select.simpler-select', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
 

diff --git a/tests/codeception/functional/Navigation/NavigationDropDownsCest.php b/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
@@ -60,7 +60,7 @@ public function testDropdownMenus(FunctionalTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Org Code', $org_term->id());
+    $I->selectOption('.js-form-item-su-site-org-0-target-id select.simpler-select', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,6 +215,10 @@ _Release Date: 2022-08-11_ @@
     - Fixed events importer title property.
+.0.4
+    -------------------------------------------------------------------------------
+    - D8CORE-7051 Use display field copy instead of token fields
 .0.3
     -------------------------------------------------------------------------------
     - Next site settings and config ignores (#735)
@@ Expand Down @@