prickle 0.0.5 → 0.0.6

data/README.md

@@ -32,7 +32,13 @@ To enable this feature you need to set the *Prickle::Capybara.wait_time* propert
 Prickle::Capybara.wait_time = 5
 ```
 
-If you only want to extend the wait time for a particular feature, then you need to reset the wait time using *Prickle::Capybara = nil*.
+If you only want to extend the wait time for a particular feature, then you need to reset the wait time using *Prickle::Capybara = nil* after your call..
+
+```ruby
+Prickle::Capybara.wait_time = 5
+element(:href => "http://google.com").click
+Prickle::Capybara.wait_time = nil             # reset wait time
+```
 
 ## Usage
 
@@ -68,6 +74,47 @@ element(:name => "flower").contains_text? "Roses"
 element(:name => "flower").has_text? "Anemone"  # exact match
 ```
 
+### Popup
+
+**Selenium**
+
+```ruby
+popup.confirm
+popup.dismiss
+popup.message
+
+popup.contains_message? "<text>"
+```
+
+**Webkit**
+
+```ruby
+popup.confirm {
+  #block that triggers confirmation dialog
+}
+
+popup.dismiss {
+  #block that triggers confirmation dialog
+}
+
+popup.accept {
+  #block that triggers alert
+}
+```
+
+Verifying popup messageo
+
+```ruby
+
+alert = popup.accept {
+  #block that triggers alert
+}
+
+alert.contains_message? "<text>"
+
+```
+
+
 ## Alternative syntax
 
 ### Find
@@ -90,16 +137,6 @@ click_input_by_name "blue" #click_<element_tag>_by_name "<name>"
 div_contains_text? "text" #<element_tag>_contains_text? "text"
 ```
 
-## Popup actions
-
-```ruby
-confirm_popup  # can be used for both confirmation boxed and alert boxes
-dismiss_popup
-popup_message
-
-popup_message_contains? "<text>"
-```
-
 ## Capturing screenshots
 
 Configure the directory where you want the screenshots to be saved

data/lib/prickle/capybara/actions.rb

@@ -22,6 +22,15 @@ module Prickle
         find_element
       end
 
+      private
+
+      ALIASES = { "find" => :exists? }
+
+      def self.for properties
+        element = Element::extract_method_missing properties
+        method = ALIASES[element[:method]] || element[:method].to_sym
+        [ method, element[:args] ].compact
+      end
     end
   end
 end

data/lib/prickle/capybara/element.rb

@@ -7,6 +7,7 @@ module Prickle
     class Element
 
       include ::Capybara::DSL
+      include Prickle::Capybara::Actions
 
       OF_ANY_TYPE = "*"
       CONVERTED_TYPES = { :link => 'a',
@@ -15,6 +16,8 @@ module Prickle
 
       private
 
+      MISSING_METHOD_REGEX = /(^.*)_(contains_text\?)|(click|find)_(.*)_by_name/
+
       def initialize type=OF_ANY_TYPE, identifier
         @identifier = identifier
         @type = type
@@ -58,10 +61,12 @@ module Prickle
         Exceptions::ElementNotFound.new(@type, identifier, @text, caught_exception)
       end
 
-      public
-
-      include Prickle::Capybara::Actions
-
+      def self.extract_method_missing properties
+        element = { }
+        element[:method] = properties[1] || properties[2]
+        element[:args] = properties[4][1]
+        element
+      end
     end
   end
 end

data/lib/prickle/capybara/popup/selenium.rb

@@ -0,0 +1,31 @@
+module Prickle
+  module Capybara
+    module Popups
+      class Selenium
+
+        include ::Capybara::DSL
+
+        def initialize
+          @popup = page.driver.browser.switch_to.alert
+        end
+
+        def confirm
+          @popup.accept
+        end
+
+        def dismiss
+          @popup.dismiss
+        end
+
+        def message
+          @popup.text
+        end
+
+        def contains_message? message
+          raise Exceptions::MessageNotContainedInPopup.new(self.message) unless self.message.eql? message
+        end
+
+      end
+    end
+  end
+end

data/lib/prickle/capybara/popup/webkit.rb

@@ -0,0 +1,68 @@
+module Prickle
+  module Capybara
+    module Popups
+      class Webkit
+
+        include ::Capybara::DSL
+
+        def confirm &block
+          set_type_to :confirm
+          manage_popup true, &block
+        end
+
+        def dismiss &block
+          set_type_to :confirm
+          manage_popup false, &block
+        end
+
+        def accept &block
+          set_type_to :alert
+          manage_popup true, &block
+        end
+
+        def message
+          @message
+        end
+
+        def contains_message? message
+          raise Exceptions::MessageNotContainedInPopup.new(self.message) unless self.message.include? message
+        end
+
+        private
+
+        def set_type_to type
+          @type = type
+        end
+
+        def type
+          @type.to_s
+        end
+
+        def manage_popup accept
+          listen_and accept
+          yield
+          restore
+          capture_message
+          self
+        end
+
+        def listen_and accept
+          page.execute_script %{
+          window.original_#{type}_function = window.#{type}
+          window.#{type}_msg = null
+          window.#{type} = function(msg) { window.#{type}_msg = msg; return #{!!accept}; }
+          }
+        end
+
+        def restore
+          page.execute_script "window.#{type} = window.original_#{type}_function"
+        end
+
+        def capture_message
+          @message = page.evaluate_script "window.#{type}_msg"
+        end
+
+      end
+    end
+  end
+end

data/lib/prickle/capybara/popup.rb

@@ -0,0 +1,24 @@
+require_relative 'popup/webkit'
+require_relative 'popup/selenium'
+
+module Prickle
+  module Capybara
+    class Popup
+
+      def initialize
+        return @base = Popups::Webkit.new if ::Capybara.current_driver == :webkit or ::Capybara.javascript_driver == :webkit
+        @base = Popups::Selenium.new
+      end
+
+
+      def method_missing method, *args, &block
+        if @base.respond_to? method
+          @base.send method, *args, &block
+        else
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/prickle/capybara.rb

@@ -1,4 +1,5 @@
 require_relative 'capybara/element'
+require_relative 'capybara/popup'
 require_relative 'exceptions'
 require_relative 'core_ext/symbol'
 
@@ -14,13 +15,6 @@ module Prickle
       find_by_name(name).click
     end
 
-    def confirm_popup
-      page.driver.browser.switch_to.alert.accept
-    end
-
-    def dismiss_popup
-      page.driver.browser.switch_to.alert.dismiss
-    end
 
     def element type=Element::OF_ANY_TYPE, identifier
       Element.new type, identifier
@@ -30,12 +24,24 @@ module Prickle
       element(type, :name => name).exists?
     end
 
+    def popup
+      Popup.new
+    end
+
+    def confirm_popup
+      popup.confirm
+    end
+
+    def dismiss_popup
+      popup.dismiss
+    end
+
     def popup_message
-      page.driver.browser.switch_to.alert.text
+      popup.message
     end
 
     def popup_message_contains? message
-      raise Exceptions::MessageNotContainedInPopup.new(message) unless popup_message.eql? message
+      popup.contains_message? message
     end
 
     def capture_screen name=screenshot_name
@@ -46,20 +52,22 @@ module Prickle
 
     TIME_FORMATTER = "%Y%m%d-%H.%M.%s"
 
+    def screenshot_name
+      Time.now.strftime(TIME_FORMATTER)
+    end
+
     def method_missing method, *args
-      if method =~ /(^.*)_contains_text\?$/
-        element($1, :name => args.first).contains_text? args[1]
-      elsif method =~ /^click_(.*)_by_name$/
-        element($1, :name => args.first).click
-      elsif method =~ /^find_(.*)_by_name$/
-        element($1, :name => args.first).exists?
+      if method =~ Element::MISSING_METHOD_REGEX
+        call_element_with $1, $2, $3, $4, args
       else
         super
       end
     end
 
-    def screenshot_name
-      Time.now.strftime(TIME_FORMATTER)
+    def call_element_with *properties
+      type = properties[0] || properties[3]
+      name = properties[4][0]
+      element(type, :name => name).send *Actions::for(properties)
     end
   end
 end

data/lib/prickle/version.rb

@@ -1,3 +1,3 @@
 module Prickle
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/prickle.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.8.0"
   s.add_development_dependency "sinatra", "~> 1.3.2"
   s.add_development_dependency "rake"
+  s.add_development_dependency "capybara-webkit"
   s.add_development_dependency "reek"
 end
 

data/spec/capybara/popups/selenium_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Prickle::Capybara::Popup do
+  let(:prickly) { Prickly.new }
+
+  before do
+    Prickle::Capybara.wait_time = nil
+  end
+
+  before(:each) do
+    prickly.visit '/'
+  end
+
+  context 'Managing selenium popups', :javascript => true do
+
+    it 'can confirm an alert box' do
+      prickly.click_by_name 'popups'
+      prickly.confirm_popup
+    end
+
+    it 'can confirm a popup' do
+      prickly.click_by_name 'confirm_box'
+      prickly.confirm_popup
+    end
+
+    it 'can dismiss a popup' do
+      prickly.click_by_name 'confirm_box'
+      prickly.dismiss_popup
+      prickly.popup_message.should eq "Aborting."
+      prickly.confirm_popup
+    end
+
+    context "matching text" do
+      it "can verify the content of a popup" do
+        prickly.click_by_name "popups"
+        prickly.popup_message_contains? "Hello"
+        prickly.dismiss_popup
+      end
+    end
+  end
+end

data/spec/capybara/popups/webkit_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Prickle::Capybara::Popup do
+  let(:prickly) { Prickly.new }
+
+  before do
+    Prickle::Capybara.wait_time = nil
+    Capybara.current_driver = :webkit
+  end
+
+  before(:each) do
+    prickly.visit '/'
+  end
+
+  after do
+    Capybara.use_default_driver
+  end
+
+  context 'Managing webkit popups', :js => true, :driver => :webkit do
+    it 'can confirm an alert box' do
+
+     alert = prickly.popup.accept {
+        prickly.click_by_name 'popups'
+     }
+
+     alert.contains_message? "Hello"
+    end
+
+    it 'can confirm a popup' do
+      alert = prickly.popup.confirm {
+        prickly.click_by_name 'confirm_box'
+      }
+      alert.contains_message? "Click yes to continue"
+    end
+
+    it 'can dismiss a popup' do
+      alert = prickly.popup.dismiss {
+        prickly.click_by_name 'confirm_box'
+      }
+
+      alert.contains_message? "Click yes to continue"
+    end
+
+  end
+end

data/spec/capybara_spec.rb

@@ -4,43 +4,11 @@ describe Prickle::Capybara do
   let(:prickly) { Prickly.new }
 
   before do
-    Capybara.default_driver = :selenium
     Prickle::Capybara.wait_time = nil
-  end
-
-  before(:each) do
     prickly.visit '/'
   end
 
-  context 'Managing popups', :javascript => true do
-
-    it 'can confirm an alert box' do
-      prickly.click_by_name 'popups'
-      prickly.confirm_popup
-    end
-
-    it 'can confirm a popup' do
-      prickly.click_by_name 'confirm_box'
-      prickly.confirm_popup
-    end
-
-    it 'can dismiss a popup' do
-      prickly.click_by_name 'confirm_box'
-      prickly.dismiss_popup
-      prickly.popup_message.should eq "Aborting."
-      prickly.confirm_popup
-    end
-
-    context "matching text" do
-      it "can verify the content of a popup" do
-        prickly.click_by_name "popups"
-        prickly.popup_message_contains? "Hello"
-        prickly.dismiss_popup
-      end
-    end
-  end
-
-  context 'Screenshots', :javascript => true do
+  context 'Screenshots', :javascript => true, :driver => :selenium do
 
     it 'can capture the screen' do
       screenshot_name = Time.now.strftime("%Y%m%d-%H.%M.%s")

data/spec/extended_wait_spec.rb

@@ -4,11 +4,10 @@ describe Prickle::Capybara do
   let(:prickly) { Prickly.new }
 
   before do
-    Capybara.default_driver = :selenium
     prickly.visit '/'
   end
 
-  context 'Extended waits', :javascript => true do
+  context 'Extended waits', :javascript => true, :driver => :selenium do
 
     before(:each) do
       Prickle::Capybara.wait_time = nil
@@ -23,7 +22,7 @@ describe Prickle::Capybara do
 
       it "can fail if an element doesn't appear after the default wait time" do
         Prickle::Capybara.wait_time = 1
-        expect { prickly.element(:name => 'lagged').contains_text? "I lag" }.to raise_error Capybara::TimeoutError
+        expect { prickly.element(:name => 'never_appear').contains_text? "I lag" }.to raise_error Capybara::TimeoutError
       end
     end
 

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require File.join(File.dirname(__FILE__), "..", "lib", "prickle", "capybara")
 
 require 'rspec'
+require 'capybara/rspec'
+require 'capybara-webkit'
 require 'prickle/capybara'
 
 class Prickly
@@ -13,3 +15,4 @@ require_relative 'stub/app'
 Capybara.app = Sinatra::Application
 Capybara.default_wait_time = 0
 Prickle::Capybara.image_dir = File.dirname(__FILE__) + "/tmp/"
+Capybara.default_driver = :selenium

data/spec/stub/index.html

@@ -13,8 +13,9 @@
     <li name="purple">Im not purple!</li>
     <a name="orangey">Me too!!</a>
 
-    <div name='lagged' class='hidden'> I lag</div>
-    <div name='orangey'  class='pink'> Blue hippos</div>
+    <div name='lagged' class='hidden' style='display: none;'> I lag</div>
+    <div name='never_appear' style='display: none;'> I lag</div>
+    <div name='orangey' class='pink'> Blue hippos</div>
 
     <p id='coffee'>Capuccino</p>
 
@@ -28,7 +29,6 @@
 
     <script>
       $(document).ready(function() {
-        $('.hidden').hide();
         setTimeout(showHidden, 3000);
       });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prickle
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70174028443700 !ruby/object:Gem::Requirement
+  requirement: &70098719150400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174028443700
+  version_requirements: *70098719150400
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70174028443100 !ruby/object:Gem::Requirement
+  requirement: &70098719149760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174028443100
+  version_requirements: *70098719149760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174028442480 !ruby/object:Gem::Requirement
+  requirement: &70098719149100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70174028442480
+  version_requirements: *70098719149100
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70174028441920 !ruby/object:Gem::Requirement
+  requirement: &70098719148440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70174028441920
+  version_requirements: *70098719148440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70174028441480 !ruby/object:Gem::Requirement
+  requirement: &70098719147940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174028441480
+  version_requirements: *70098719147940
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: &70098719147380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70098719147380
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &70174028440740 !ruby/object:Gem::Requirement
+  requirement: &70098719163000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174028440740
+  version_requirements: *70098719163000
 description: A simple DSL extending Capybara.
 email: despo@extractmethod.com
 executables: []
@@ -93,6 +104,9 @@ files:
 - lib/prickle/capybara.rb
 - lib/prickle/capybara/actions.rb
 - lib/prickle/capybara/element.rb
+- lib/prickle/capybara/popup.rb
+- lib/prickle/capybara/popup/selenium.rb
+- lib/prickle/capybara/popup/webkit.rb
 - lib/prickle/capybara/xpath.rb
 - lib/prickle/capybara/xpath/expression.rb
 - lib/prickle/core_ext/symbol.rb
@@ -101,10 +115,12 @@ files:
 - lib/prickle/version.rb
 - prickle.gemspec
 - prickle.png
+- spec/capybara/actions_spec.rb
+- spec/capybara/element_spec.rb
+- spec/capybara/popups/selenium_spec.rb
+- spec/capybara/popups/webkit_spec.rb
 - spec/capybara_spec.rb
-- spec/element_spec.rb
 - spec/extended_wait_spec.rb
-- spec/finders_spec.rb
 - spec/spec_helper.rb
 - spec/stub/app.rb
 - spec/stub/index.html