From 41ebef687d6d3db9957d71bd4ff67332f6fca241 Mon Sep 17 00:00:00 2001 From: Chris Hallberg <crhallberg@gmail.com> Date: Tue, 23 Feb 2016 15:51:10 -0500 Subject: [PATCH] Adjust advanced search test to test editting more than 3 terms. --- .../VuFindTest/Mink/AdvancedSearchTest.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/AdvancedSearchTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/AdvancedSearchTest.php index 52b0f061c73..2622637af48 100644 --- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/AdvancedSearchTest.php +++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/AdvancedSearchTest.php @@ -81,19 +81,12 @@ class AdvancedSearchTest extends \VuFindTest\Unit\MinkTestCase $this->findCss($page, '#search_lookfor0_3')->setValue('1883'); $this->findCss($page, '#search_type0_3')->selectOption('year'); - // Term removal - $session->executeScript("deleteSearch(0, 2)"); // search0_2 x click - $this->assertNull($page->findById('search0_3')); - // Terms collapsing up - $this->assertEquals('1883', $this->findCss($page, '#search_lookfor0_2')->getValue()); - $this->assertEquals('year', $this->findCss($page, '#search_type0_2')->getValue()); - // Submit search form $this->findCss($page, '[type=submit]')->press(); // Check for proper search $this->assertEquals( - '(All Fields:bride AND Title:tomb AND Year of Publication:1883)', + '(All Fields:bride AND Title:tomb AND All Fields:garbage AND Year of Publication:1883)', $this->findCss($page, '.adv_search_terms strong')->getHtml() ); @@ -110,7 +103,15 @@ class AdvancedSearchTest extends \VuFindTest\Unit\MinkTestCase $this->assertEquals('bride', $this->findCss($page, '#search_lookfor0_0')->getValue()); $this->assertEquals('tomb', $this->findCss($page, '#search_lookfor0_1')->getValue()); $this->assertEquals('Title', $this->findCss($page, '#search_type0_1')->getValue()); - $this->assertEquals('1883', $this->findCss($page, '#search_lookfor0_2')->getValue()); - $this->assertEquals('year', $this->findCss($page, '#search_type0_2')->getValue()); + $this->assertEquals('garbage', $this->findCss($page, '#search_lookfor0_2')->getValue()); + $this->assertEquals('1883', $this->findCss($page, '#search_lookfor0_3')->getValue()); + $this->assertEquals('year', $this->findCss($page, '#search_type0_3')->getValue()); + + // Term removal + $session->executeScript("deleteSearch(0, 2)"); // search0_2 x click + $this->assertNull($page->findById('search0_3')); + // Terms collapsing up + $this->assertEquals('1883', $this->findCss($page, '#search_lookfor0_2')->getValue()); + $this->assertEquals('year', $this->findCss($page, '#search_type0_2')->getValue()); } } -- GitLab