sapphire 0.5.3 → 0.5.4

data/lib/sapphire/DSL/Browser/{Reload.rb → Verbs/Reload.rb}

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Reload(item)
-        @browser.Reload
-        Should Show item
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Reload(item)
+        $browser.Reload
+        Should Show item
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Verbs/Set.rb

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Set(hash)
+        hash.With(:page => @page)
+        hash.Set hash
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Browser/{Show.rb → Verbs/Show.rb}

@@ -1,26 +1,25 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Show(item)
-        NullModifier.new(Show.new(item, @page, @browser))
-      end
-
-      class Show
-        def initialize(item, page, browser)
-          @item = item
-          @page = page
-          @browser = browser
-        end
-
-        def ModifyWith(item)
-          @modifier = item
-        end
-
-        def execute
-          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Show(@item, @modifier), :modifier => @modifier }
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Show(item)
+        NullModifier.new(Show.new(item, @page))
+      end
+
+      class Show
+        def initialize(item, page)
+          @item = item
+          @page = page
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Show(@item, @modifier), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Start.rb → Verbs/Start.rb}

@@ -1,16 +1,16 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Start(browser)
-        if(browser == ConfigurationBrowser)
-          @browser = AppConfig.Current.Browser
-        else
-          @browser = browser
-        end
-
-        @browser.SetRootUrl(@rootUrl)
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Start(browser)
+        if(browser == ConfigurationBrowser)
+          AppConfig.Current.Browser
+        else
+          browser.new
+        end
+
+        $browser.SetRootUrl(@rootUrl)
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Transition.rb → Verbs/Transition.rb}

@@ -1,26 +1,25 @@
-module Sapphire
-  module DSL
-    module Browser
-
-      def Transition(url)
-        NullModifier.new(Transition.new(url, @browser))
-      end
-
-      class Transition
-        def initialize(item, browser)
-          @item = item
-          @browser = browser
-        end
-
-        def ModifyWith(item)
-          @modifier = item
-        end
-
-        def execute
-          @modifier.Modify(@browser.ShouldTransitionTo(@item))
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+
+      def Transition(url)
+        NullModifier.new(Transition.new(url))
+      end
+
+      class Transition
+        def initialize(item)
+          @item = item
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          @modifier.Modify($browser.ShouldTransitionTo(@item))
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Verbs/Uncheck.rb

@@ -0,0 +1,11 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Uncheck(item)
+        item.With(:page => @page)
+        item.Uncheck
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Wait.rb → Verbs/Wait.rb}

@@ -1,8 +1,8 @@
 module Sapphire
   module DSL
     module Browser
-      def Wait(seconds)
-        sleep(seconds)
+      def Wait(item)
+        item.Wait
       end
     end
   end

data/lib/sapphire/DSL/Configuration/ConfiguredBrowser.rb

@@ -1,13 +1,13 @@
-module Sapphire
-  module DSL
-    module Configuration
-      def ConfiguredBrowser(url)
-        @rootUrl = url
-        ConfigurationBrowser
-      end
-
-      class ConfigurationBrowser
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Configuration
+      def ConfiguredBrowser(url)
+        @rootUrl = url
+        ConfigurationBrowser
+      end
+
+      class ConfigurationBrowser
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Configuration/ConfiguredUser.rb

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Configuration
-      def configured_user
-        $user
-      end
-      class ConfiguredUser
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Configuration
+      def configured_user
+        $user
+      end
+      class ConfiguredUser
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Configuration/Use.rb

@@ -1,15 +1,15 @@
-module Sapphire
-  module DSL
-    module Configuration
-      def Use(user)
-        if(user == ConfiguredUser)
-          $user = AppConfig.new().User
-        else
-          $user = user.new
-        end
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module DSL
+    module Configuration
+      def Use(user)
+        if(user == ConfiguredUser)
+          $user = AppConfig.new().User
+        else
+          $user = user.new
+        end
+      end
+    end
+  end
+end
+
+

data/lib/sapphire/DSL/Data/Exist.rb

@@ -1,27 +1,27 @@
-module Sapphire
-  module DSL
-    module Data
-      def Exist(value)
-        Not(Exist.new(value, @page, @browser))
-      end
-
-      class Exist
-        def initialize(item, page, browser)
-          @item = item
-          @page = page
-          @browser = browser
-        end
-
-        def ModifyWith(item)
-          @modifier = item
-        end
-
-        def execute
-          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Exists(@item), :modifier => @modifier }
-        end
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module DSL
+    module Data
+      def Exist(value)
+        Not(Exist.new(value, @page))
+      end
+
+      class Exist
+        def initialize(item, page)
+          @item = item
+          @page = page
+          @browser = browser
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Exists(@item), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+
+

data/lib/sapphire/DSL/Data/Find.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Data
-      def Find(query, &block)
-        query.Execute block
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def Find(query, &block)
+        query.Execute block
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Data/GetPageField.rb

@@ -1,17 +1,17 @@
-module Sapphire
-  module DSL
-    module Data
-      def GetPageField(key)
-        @page.fields.each do |field|
-          field.keys.each do |field_key|
-            if(field_key == key)
-              return field[key]
-            end
-          end
-        end
-        raise "Could not find control for: " + key + " for page " + @page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def GetPageField(key)
+        @page.fields.each do |field|
+          field.keys.each do |field_key|
+            if(field_key == key)
+              return field[key]
+            end
+          end
+        end
+        raise "Could not find control for: " + key + " for page " + @page.to_s
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Data/Underscore.rb

@@ -1,9 +1,9 @@
-class String
-   def underscore
-       self.gsub(/::/, '/').
-       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-       gsub(/([a-z\d])([A-Z])/,'\1_\2').
-       tr("-", "_").
-       downcase
-   end
+class String
+   def underscore
+       self.gsub(/::/, '/').
+       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+       gsub(/([a-z\d])([A-Z])/,'\1_\2').
+       tr("-", "_").
+       downcase
+   end
 end

data/lib/sapphire/DSL/Data/Validate.rb

@@ -1,26 +1,26 @@
-module Sapphire
-  module DSL
-    module Data
-      def Validate(hash)
-        NullModifier.new(Validate.new(hash, @page, @browser))
-      end
-
-      class Validate
-        def initialize(item, page, browser)
-          @item = item
-          @page = page
-          @browser = browser
-        end
-
-        def ModifyWith(item)
-          @modifier = item
-        end
-
-        def execute
-          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Validate(@item), :modifier => @modifier }
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def Validate(hash)
+        NullModifier.new(Validate.new(hash, @page))
+      end
+
+      class Validate
+        def initialize(item, page)
+          @item = item
+          @page = page
+          @browser = browser
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Validate(@item), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Data/Verify.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Data
-      def Verify(instance)
-        instance.Verify
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def Verify(instance)
+        instance.Verify
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Scenarios/Is.rb

@@ -1,9 +1,9 @@
-module Sapphire
-  module DSL
-    module Scenarios
-      def Is(item)
-        item
-      end
-    end
-  end
-end
+module Sapphire
+  module DSL
+    module Scenarios
+      def Is(item)
+        item
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Scenarios/Pending.rb

@@ -1,29 +1,29 @@
-module Sapphire
-  module DSL
-    module Scenarios
-      def Pending(text)
-        Pending.new text
-      end
-
-      class Pending
-
-        attr_reader :text
-        attr_reader :and
-
-        def initialize(text)
-          @text = text
-          @and = []
-        end
-
-        def add_and(text, &block)
-          self.and << Then.new(text, &block)
-        end
-
-        def to_s
-          self.text
-        end
-
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Scenarios
+      def Pending(text)
+        Pending.new text
+      end
+
+      class Pending
+
+        attr_reader :text
+        attr_reader :and
+
+        def initialize(text)
+          @text = text
+          @and = []
+        end
+
+        def add_and(text, &block)
+          self.and << Then.new(text, &block)
+        end
+
+        def to_s
+          self.text
+        end
+
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Scenarios/and.rb

@@ -1,26 +1,26 @@
-require File.expand_path('../../Testing/Executable', File.dirname(__FILE__))
-
-class And
-  include Sapphire::Testing::Executable
-
-  attr_reader :text
-  attr_reader :block
-  attr_reader :value
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, text, &block)
-    @block = block
-    @text = text.to_s
-    @value = text
-    @parent = parent
-    @results = []
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.results.last.AddChild(result)
-  end
-
+require File.expand_path('../../Testing/Executable', File.dirname(__FILE__))
+
+class And
+  include Sapphire::Testing::Executable
+
+  attr_reader :text
+  attr_reader :block
+  attr_reader :value
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, text, &block)
+    @block = block
+    @text = text.to_s
+    @value = text
+    @parent = parent
+    @results = []
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.results.last.AddChild(result)
+  end
+
 end