restore env -a filter in repl

gwen-interpreter · Oct 29, 2024 · bf8fcc3 · bf8fcc3
1 parent 4c7207a
commit bf8fcc3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 60 deletions.
diff --git a/src/test/features/google/GoogleSearch.feature b/src/test/features/google/GoogleSearch.feature
@@ -34,5 +34,5 @@ Feature: Google search
       And topic is "Automation"
       And topic link can be located by partial link text "${topic}"
      When I enter "automation" in the search field
-      And I click topic link if topic link is displayed
-     Then the page title should contain "${topic}"
+      And I locate topic link if topic link is displayed
+     Then topic link should be displayed
diff --git a/src/test/features/locators/RelativeLocators.feature b/src/test/features/locators/RelativeLocators.feature
diff --git a/src/test/features/multi-windows/MultiWindows.feature b/src/test/features/multi-windows/MultiWindows.feature
diff --git a/src/test/scala/gwen/web/eval/WebEngineTest.scala b/src/test/scala/gwen/web/eval/WebEngineTest.scala
@@ -102,20 +102,20 @@ class WebEngineTest extends BaseTest with Matchers with MockitoSugar with Before
   private var envState: EnvState = uninitialized
   private var ctx: WebContext = uninitialized
   private var mockTopScope: TopScope = uninitialized
-  private var mockParamScope: TransientStack = uninitialized
-  private var mockRuleScope: TransientStack = uninitialized
-  private var mockScenarioScope: TransientStack = uninitialized
-  private var mockStepDefScope: TransientStack = uninitialized
+  private var mockParamScope: ScopedDataStack = uninitialized
+  private var mockRuleScope: ScopedDataStack = uninitialized
+  private var mockScenarioScope: ScopedDataStack = uninitialized
+  private var mockStepDefScope: ScopedDataStack = uninitialized
   private var mockLocator: WebElementLocator = uninitialized
 
   override def beforeEach(): Unit = {
     envState = spy(EnvState())
     ctx = spy(new WebContext(GwenOptions(), envState, mock[DriverManager]))
     mockTopScope = mock[TopScope]
-    mockParamScope = mock[TransientStack]
-    mockRuleScope = mock[TransientStack]
-    mockScenarioScope = mock[TransientStack]
-    mockStepDefScope = mock[TransientStack]
+    mockParamScope = mock[ScopedDataStack]
+    mockRuleScope = mock[ScopedDataStack]
+    mockScenarioScope = mock[ScopedDataStack]
+    mockStepDefScope = mock[ScopedDataStack]
     mockLocator = mock[WebElementLocator]
     doReturn(mockTopScope).when(ctx).topScope
     doReturn(mockParamScope).when(mockTopScope).paramScope

diff --git a/src/test/scala/gwen/web/eval/WebEnvironmentTest.scala b/src/test/scala/gwen/web/eval/WebEnvironmentTest.scala
@@ -38,7 +38,7 @@ class WebEnvironmentTest extends BaseTest with Matchers with MockitoSugar {
 
   "json on new ctx context" should "be empty" in {
     val ctx = newCtx()
-    ctx.topScope.asString.replace("\r", "") should be ("""scope : "feature" { }""")
+    ctx.topScope.asString(all = false, env = false).replace("\r", "") should be ("""scope : "feature" { }""")
   }
 
   "JavaScript binding on dry run" should "not resolve" in {