From 3e49f9d4adc66484fe3884927899fba913cc96b9 Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Tue, 23 Apr 2024 08:40:11 -0400
Subject: [PATCH] fix tests

---
 .../IntegerWeightTest.php                     | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/tests/src/FunctionalJavascript/IntegerWeightTest.php b/tests/src/FunctionalJavascript/IntegerWeightTest.php
index 4f07be962..d9e18ef08 100644
--- a/tests/src/FunctionalJavascript/IntegerWeightTest.php
+++ b/tests/src/FunctionalJavascript/IntegerWeightTest.php
@@ -31,6 +31,7 @@ class IntegerWeightTest extends WebDriverTestBase {
     'views',
     'field_ui',
     'integer_weight_test_views',
+    'islandora',
   ];
 
   /**
@@ -83,24 +84,13 @@ class IntegerWeightTest extends WebDriverTestBase {
    */
   public function setUp(): void {
     parent::setUp();
+    $this->drupalCreateContentType([
+      'type' => 'repo_item',
+      'name' => 'Repository Item',
+    ]);
+
+    $this->drupalLogin($this->createUser(['edit any repo_item content'], 'test', TRUE));
 
-    $this->adminUser = $this->drupalCreateUser(
-          [
-            'administer content types',
-            'administer node fields',
-            'administer node display',
-          ]
-    );
-
-    // Create dummy repo_item type to sort (since we don't have
-    // repository_object without islandora_defaults).
-    $type = $this->container->get('entity_type.manager')->getStorage('node_type')
-      ->create([
-        'type' => 'repo_item',
-        'name' => 'Repository Item',
-      ]);
-    $type->save();
-    $this->container->get('router.builder')->rebuild();
 
     $fieldStorage = FieldStorageConfig::create([
       'field_name' => static::$fieldName,
@@ -132,9 +122,11 @@ public function setUp(): void {
    * Test integer weight selector.
    */
   public function testIntegerWeightSelector() {
-    $this->drupalGet('test-integer-weight');
-    $page = $this->getSession()->getPage();
+    $web_assert = $this->assertSession();
+    $this->drupalGet('/test-integer-weight');
+    $web_assert->pageTextContains('Item 1');
 
+    $page = $this->getSession()->getPage();
     $weight_select1 = $page->findField("field_integer_weight[0][weight]");
     $weight_select2 = $page->findField("field_integer_weight[1][weight]");
     $weight_select3 = $page->findField("field_integer_weight[2][weight]");