Fixed BaseStepDefinitions so that current page is persistant across s…

…teps
alisterscott · Mar 16, 2011 · 14c5658 · 14c5658
1 parent 1db59d3
commit 14c5658
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/SpecDriver/Pages/BasePageModel.cs b/SpecDriver/Pages/BasePageModel.cs
@@ -16,29 +16,17 @@ protected BasePageModel(IWebDriver webDriver, By knownElementOnPage)
             this.FindKnownElementOnPage(knownElementOnPage);
         }
 
-
         public string Title
         {
-            get
+            get { return driver.Title; }
-            {
-                return driver.Title;
-            }
         }
 
         public IWebDriver Driver
         {
-            get
+            get { return this.driver; }
-            {
+            set { this.driver = value; }
-                return this.driver;
-            }
-
-            set
-            {
-                this.driver = value;
-            }
         }
 
-
         private void FindKnownElementOnPage(By knownElementOnPage)
         {
             this.Driver.FindElement(knownElementOnPage);

diff --git a/SpecDriver/StepDefinitions/BaseStepDefinitions.cs b/SpecDriver/StepDefinitions/BaseStepDefinitions.cs
@@ -11,9 +11,17 @@ namespace Project1.StepDefinitions
     [Binding]
     public class BaseStepDefinitions
     {
+        private const string CurrentPageKey = "Current.Page";
         public static IWebDriver Driver { get; set; }
-        protected GoogleHomePageModel GoogleHomePage { get; set; }
+        protected GoogleHomePageModel GoogleHomePage
-        protected GoogleSearchResultsPageModel GoogleSearchResultsPage { get; set; }
+        {
-
+            get { return (GoogleHomePageModel)ScenarioContext.Current[CurrentPageKey]; }
+            set { ScenarioContext.Current[CurrentPageKey] = value; }
+        }
+        protected GoogleSearchResultsPageModel GoogleSearchResultsPage
+        {
+            get { return (GoogleSearchResultsPageModel)ScenarioContext.Current[CurrentPageKey]; }
+            set { ScenarioContext.Current[CurrentPageKey] = value; }
+        }
     }
 }