capybara-wheel 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7eb7e1a4fe1c379fc67e9476d41d5a8ff903ae4
+  data.tar.gz: de3e57cf80c9486a20b9a8e2e55d5af5a660336e
+SHA512:
+  metadata.gz: e0f46027cfc86fcd4e7f64b9fb41855e095aec432cd417f9484a043386b9e339bc1969073a18211015ef6e0e6612a643c738ae8b158b977e4d827236a749fae6
+  data.tar.gz: f89b716d8127af090831941f80dd66d47228ded6f65a9835c80511c8a20500c195b8462d31e19ac8143c617ea0edd2bf33a5a3c1de63c578f0a02d002bbce30d

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/README.md

@@ -93,7 +93,7 @@ A page needs to implement two methods:
   and
 
     def on_page?
-      # Capybara Wheel calls this method before excuting the page block (see Specs section below below)
+      # Capybara Wheel calls this method before excuting the page block (see Specs section below)
       # Recommended: Use Wheel native Page method has_title?('Title')
       # e.g. has_title?('Login')
 
@@ -122,10 +122,7 @@ A page needs to implement two methods:
 
 Once inside a Page model, it has access to the `element` method.
 
-    element 'ElementName', 'selector' *optional block*
-
-    # Wheel recommends using a name that follows the class constant name convention (i.e CamelCase)
-    # as an object will be created and assigned this name (see below)
+    element 'element_name', 'selector' *optional block*
 
 The `element` method does several important things:
 
@@ -144,7 +141,7 @@ Passing a block to element gives access to the Element object for the purpose of
 
 **_Example:_**
 
-     element 'ButtonOfDoom', '#doom-button' do
+     element 'button_of_doom', '#doom-button' do
 
         def armed?
           capybara_element.text == 'Armed'
@@ -152,7 +149,7 @@ Passing a block to element gives access to the Element object for the purpose of
 
       end
 
-     element 'MissleTracker', '.missle-tracker'
+     element 'middle_tracker', '.missle-tracker'
 
 
      #=> SuperVillanConsole.new.button_of_doom.armed?
@@ -165,7 +162,7 @@ Passing a block to element gives access to the Element object for the purpose of
 
 An element block also accepts the `element` method.
 
-    element 'SubElementName', 'selector' *optional block*
+    element 'sub_element_name', 'selector' *optional block*
 
 When called inside an element block, the element behaves like an Element but is now scoped to the containing (or parent) element, which reduces ambiguity.
 
@@ -173,10 +170,10 @@ When called inside an element block, the element behaves like an Element but is
 
  Two buttons have an `li` element with the `.key` class. We want to be able to find one and turn it without accidently causing world peace:
 
-     element 'ButtonOfDoom', '#doom-button' do
+     element 'button_of_doom', '#doom-button' do
 
         # reference to this key is scoped inside the #doom-button element
-        element 'ArmingKey', 'li.key' do
+        element 'arming_key', 'li.key' do
 
           def turn
             click
@@ -185,10 +182,10 @@ When called inside an element block, the element behaves like an Element but is
         end
      end
 
-     element 'ButtonOfWorldPeace', '#peace-button' do
+     element 'button_of_world_peace', '#peace-button' do
 
        # reference to this key is scoped inside the #peace-button element
-       element 'ArmingKey', 'li.key' do
+       element 'arming_key', 'li.key' do
 
          def turn
            click
@@ -212,12 +209,16 @@ Wheel specs are written to always refer to the models and to never refer to Capy
 
 The visit page would use the `on_page?` method to determine if we are indeed on the page. It will use Capyara's internal wait to poll the page until it is ready. We can then even excute within the scope of the page:
 
+Use the `.visit` method to navigate to the page:
+
     it 'can visit a page and pass a block to execute' do
       some_page.visit do | page |
         page.some_element.should be_visible
       end
     end
 
+Or the `.on` method to act on a page without navigating (Capybara Wheel will still check we're on the page):
+
     it 'can also just check if we're on the page without visiting it'
       some_page.on do | page |
         page.some_element.should be_visible

data/capybara-wheel.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'capybara/wheel/version'
@@ -18,11 +19,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capybara", "~> 2.1"
-  spec.add_dependency "rspec"
+  spec.add_dependency "capybara"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
   spec.add_development_dependency "selenium-webdriver", "~> 2.0"
   spec.add_development_dependency "sinatra", "~> 1.0"
   spec.add_development_dependency "pry"

data/lib/capybara/wheel/element.rb

@@ -9,32 +9,22 @@ module Capybara
         include Capybara::Wheel::Includes
         extend Capybara::Wheel::Includes::ClassIncludes
 
-        attr_reader :scope
+        attr_reader :selector, :options, :scope
 
-        def initialize(selector = nil, scope = nil)
-          @selector = selector if selector
-          @scope    = scope
+        def initialize(selector = nil, options = {}, scope = nil)
+          @selector = selector
+          @options = options
+          @scope = scope
         end
 
-        def_delegators  :capybara_element,
-                        :find,
-                        :click,
-                        :has_content?,
-                        :checked?,
-                        :text,
-                        :visible?,
-                        :present?,
-                        :selected?,
-                        :disabled?,
-                        :tag_name,
-                        :value,
-                        :set,
-                        :select_option,
-                        :unselect_option,
-                        :hover,
-                        :[]
-
+        def self.capybara_element_methods
+          Capybara::Node::Element.instance_methods -
+           Capybara::Node::Element.methods -
+           Capybara::Node::Element.superclass.methods
+        end
 
+        def_delegators  :capybara_element,
+                        *capybara_element_methods
 
         def present?
           capybara_element.visible?
@@ -50,41 +40,24 @@ module Capybara
           false
         end
 
-        def self.element(name, selector, block = nil)
+        def self.element(name, selector, options = {}, block = nil)
           subelement_factory = lambda do |parent_element|
-            Capybara::Wheel::ElementFactory.create_element(selector, parent_element, block)
+            Capybara::Wheel::ElementFactory.create_element(selector, parent_element, options, block)
           end
 
           define_method(underscore(name).to_sym) { subelement_factory.call(self) }
           self
         end
 
-        def element(name, selector, &block)
-          self.class.element(name, selector, block)
-        end
-
-        #TODO: deprecated in 0.0.5
-        def subelement(name, selector, &block)
-          puts "subelement will be deprecated in future versions."
-          puts "Calling element inside an element block will scope it to the parent element"
-          element(name, selector, block)
-        end
-
-        def self.subelement(name, selector, &block)
-          puts "subelement will be deprecated in future versions."
-          puts "Calling element inside an element block will scope it to the parent element"
-          element(name, selector, &block)
-        end
-
-        def selector
-          @selector
+        def element(name, selector, options = {}, &block)
+          self.class.element(name, selector, options, block)
         end
 
         private
 
         # Finds a capybara element representing this thing
         def capybara_element
-          scope_capybara.find(selector)
+          scope_capybara.find(selector, options)
         end
 
         def scope_capybara
@@ -93,4 +66,4 @@ module Capybara
 
     end
   end
-end
+end

data/lib/capybara/wheel/element_factory.rb

@@ -4,23 +4,17 @@ module Capybara
   module Wheel
     class ElementFactory
 
-      def self.create_element_klass(selector, block = nil)
+      def self.create_element_klass(selector, options = {}, block = nil)
         subclass = Class.new(Capybara::Wheel::Element)
 
-        _selector = selector
-
-        subclass.class_exec do
-          define_method(:selector) { @selector = _selector }
-        end
-
         subclass.class_eval(&block) if block
 
         subclass
       end
 
       #TODO: Pass object not an instance
-      def self.create_element(selector, parent_element, block = nil)
-        subelement = Capybara::Wheel::Element.new(selector, parent_element)
+      def self.create_element(selector, parent_element, options = {}, block = nil)
+        subelement = Capybara::Wheel::Element.new(selector, options, parent_element)
         subelement.instance_eval(&block) if block
 
         subelement

data/lib/capybara/wheel/includes.rb

@@ -22,8 +22,15 @@ module Capybara
                   downcase
         end
 
-        def make_const(string)
+        # Stolen from the Rails codebase
+        def camelize(term)
+          string = term.to_s
 
+          string = string.sub(/^[a-z\d]*/) { $&.capitalize }
+
+          string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$2.capitalize}" }
+
+          string
         end
       end
 

data/lib/capybara/wheel/page.rb

@@ -23,6 +23,7 @@ module Capybara
         unless on_page?
           raise "We don't appear to be on the #{self.class}"
         end
+
         yield self if block_given?
         self
       end
@@ -41,19 +42,14 @@ module Capybara
         capybara.has_css?("head title", text: expected_title)
       end
 
-      def self.element(name, selector, &block)
-        begin
-          element_klass = const_set("#{name}", Capybara::Wheel::ElementFactory.create_element_klass(selector, block))
-        rescue NameError
-          puts "We recommend using capitalized element and subelement names"
-          name = name.capitalize!
-          retry
-        end
+      def self.element(name, selector, options = {}, &block)
+        klass_name = camelize(name)
+        element_klass = const_set("#{klass_name}", Capybara::Wheel::ElementFactory.create_element_klass(selector, options, block))
 
-        define_method(underscore(name).to_sym) { element_klass.new(selector) }
+        define_method(underscore(name).to_sym) { element_klass.new(selector, options) }
         self
       end
 
     end
   end
-end
+end

data/lib/capybara/wheel/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Wheel
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/element_factory_spec.rb

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
-feature 'ElementFactory' do
+describe 'ElementFactory' do
   let(:subject)               { Capybara::Wheel::ElementFactory }
   let(:selector)              { '#rad-selector'}
   let(:created_element_klass) { subject.create_element_klass(selector) }
 
-
-  it 'creates an element' do
-    created_element_klass.superclass.should == Capybara::Wheel::Element
-  end
-
-  it 'allows access to the selector' do
-    created_element_klass.new.selector.should == selector
+  describe '.create_element_klass' do
+    it 'creates an element object' do
+      expect(created_element_klass.superclass).to  eq(Capybara::Wheel::Element)
+    end
   end
 
-  it 'generated instance evalutes block' do
-    test_block = Proc.new do
-      def evaled_method
+  context 'when block provided' do
+    it 'it evalutes block' do
+      test_block = Proc.new do
+        def evaled_method
+        end
       end
-    end
 
-    subject.create_element_klass(selector, test_block).new.should respond_to(:evaled_method)
+      element = Capybara::Wheel::ElementFactory.create_element_klass(selector, {}, test_block)
+      expect(element.new).to respond_to(:evaled_method)
+    end
   end
 end

data/spec/element_spec.rb

@@ -1,50 +1,78 @@
 require 'spec_helper'
 
-feature 'Element' do
-  let(:element_selector)  { '#some-selector' }
-  let(:element)           { Capybara::Wheel::Element }
-  let(:element_instance)  {  element.new(element_selector) }
+module Capybara
+  module Wheel
+    describe Element do
+      let(:element_selector)  { '#some-selector' }
+      let(:element)           { Capybara::Wheel::Element }
+      let(:element_instance)  {  element.new(element_selector) }
 
-  it 'has access to capybara' do
-    element_instance.methods.include?(:capybara).should be_true
-  end
+      it 'has delegators for Capybara actions' do
+        capybara_element_methods = Capybara::Node::Element.instance_methods -
+                                    Capybara::Node::Element.methods -
+                                    Capybara::Node::Element.superclass.methods
 
-  it 'has delegators for Capybara actions' do
-    pending 'grab all the actions from Capybara and ensure delegators are implemented'
-  end
+        capybara_element_methods.each do |_method_|
+          expect(element_instance).to respond_to(_method_)
+        end
+      end
 
-  context 'self.element' do
-    let(:element_selector)    { '#rad-parent-selector' }
+      context '.element' do
+        let(:element_selector)    { '#rad-parent-selector' }
 
-    let(:subelement_name)     { 'RadSubElement' }
-    let(:subelement_selector) { '#rad-sub-selector' }
+        let(:subelement_name)     { 'RadSubElement' }
+        let(:subelement_selector) { '#rad-sub-selector' }
 
-    before do
-      element_instance.instance_eval do
-        element('RadSubElement', '#rad-sub-selector')
-      end
-    end
+        before do
+          element_instance.instance_eval do
+            element('rad_sub_element', '#rad-sub-selector')
+          end
+        end
 
-    it 'created a method for calling the element' do
-      element_instance.should respond_to(:rad_sub_element)
-    end
+        it 'created a method for calling the element' do
+          expect(element_instance).to respond_to(:rad_sub_element)
+        end
 
-    it 'create a (sub)element with parent element context' do
-      element_instance.send(:rad_sub_element).scope.should == element_instance
-    end
+        it 'create a (sub)element with parent element context' do
+          expect(element_instance.send(:rad_sub_element).scope).to eq(element_instance)
+        end
+
+        it 'any method call on subelement is scoped within the parent element' do
+          subelement = element_instance.send(:rad_sub_element)
 
-    it 'the find would be scoped to parent' do
-      subelement             = element_instance.send(:rad_sub_element)
-      mock_capybara_session  = mock(Capybara::Session)
-      mock_capybara_element  = mock('Capybara::Element')
-      Capybara.stub!(:current_session).and_return(mock_capybara_session)
-      mock_capybara_session.stub(:find).with(element_selector).and_return(mock_capybara_element)
-      mock_capybara_element.stub(:find).with(subelement_selector).and_return(mock_capybara_element)
+          expect(element_instance).to receive(:capybara_element).once.and_return(double('element', find: 'something'))
 
-      element_instance.should_receive(:capybara_element).once.and_return(mock_capybara_element)
+          subelement.send(:capybara_element)
+        end
+
+        context 'with extra options' do
+
+          before do
+            element_instance.instance_eval do
+              element('rad_sub_element', '#rad-sub-selector', visible: false)
+            end
+          end
+
+          it 'has options' do
+            expect(element_instance.rad_sub_element.options).to eq(visible: false)
+          end
+
+        end
+
+        context 'when the method name is in the old camel case syntax' do
+          before do
+            element_instance.instance_eval do
+              element('OldRadSubElement', '#other-rad-sub-selector')
+            end
+          end
+
+          it 'created a method for calling the element' do
+            expect(element_instance).to respond_to(:old_rad_sub_element)
+            expect(element_instance.old_rad_sub_element.class).to eq(Capybara::Wheel::Element)
+          end
+        end
+      end
 
-      subelement.send(:capybara_element)
     end
   end
-
 end

data/spec/feature_spec.rb

@@ -11,11 +11,11 @@ feature 'runs as a wheel feature', :some_hook do
   it 'should pass' do
   end
 
-  it 'should be set as a wheel feature' do
-    example.metadata[:type].should == :wheel_feature
+  it 'should be set as a wheel feature' do |example|
+    expect(example.metadata[:type]).to eq(:wheel_feature)
   end
 
   it 'should pass the right hook' do
-    @hook_passed_on.should be_true
+    expect(@hook_passed_on).to be_truthy
   end
 end

data/spec/includes_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Capybara
+  module Wheel
+    describe Includes do
+
+      let(:some_class) do
+        class SomeClass
+          extend Capybara::Wheel::Includes::ClassIncludes
+        end
+      end
+
+      describe '.camelize' do
+        it 'capitlizes one word' do
+          expect(some_class.camelize('downcase')).to eq('Downcase')
+        end
+
+        it 'camelizes underscored word' do
+          expect(some_class.camelize('under_score')).to eq('UnderScore')
+        end
+      end
+
+      describe '.underscore' do
+        it 'underscores and downcase a camelized word' do
+          expect(some_class.underscore('CamelCase')).to eq('camel_case')
+        end
+      end
+
+    end
+  end
+end

data/spec/page_spec.rb

@@ -1,16 +1,43 @@
 require 'spec_helper'
 
-feature 'Page' do
-  let(:page) { Capybara::Wheel::Page }
+module Capybara
+  module Wheel
+    describe Page do
 
-  it 'has access to capybara' do
-    page.new.methods.include?(:capybara).should be_true
-  end
+      let(:page) { Capybara::Wheel::Page }
+
+      it 'has access to capybara' do
+        expect(page.new).to respond_to(:capybara)
+      end
+
+      describe '.element' do
+
+        let(:page_instance) { page.element('rad_element', '#rad-selector').new }
+
+        it 'creates an accessor for an element instance' do
+          expect(page_instance.rad_element.class).to eq(Capybara::Wheel::Page::RadElement)
+          expect(page_instance.rad_element.selector).to eq('#rad-selector')
+        end
+
+        context 'when named using the old camel case syntax' do
+          let(:page_instance) { page.element('RadElement', '#rad-selector').new }
+
+          it 'creates an accessor for an element' do
+            expect(page_instance).to respond_to(:rad_element)
+          end
+        end
+
+        context 'element with extra options' do
+          let(:page_instance) { page.element('optional_element', '#opt-selector', visible: false).new }
+
+          it 'has options' do
+            expect(page_instance.optional_element.options).to eq(visible: false)
+          end
+
+        end
+
+      end
 
-  context 'can create an element instance' do
-    it 'and create a method for it' do
-      page.element('RadElement', '#rad-selector').new.should respond_to(:rad_element)
     end
   end
-
-end
+end

metadata

@@ -1,126 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: capybara-wheel
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
-- ! '@gabrielrotbart'
+- "@gabrielrotbart"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Keeping the rodent on track
@@ -130,7 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -145,37 +103,38 @@ files:
 - spec/element_factory_spec.rb
 - spec/element_spec.rb
 - spec/feature_spec.rb
+- spec/includes_spec.rb
 - spec/page_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/hooroo/capybara-wheel
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Creating (yet another) page model gem based around making capybara tests
   more stable with no need for waits
 test_files:
 - spec/element_factory_spec.rb
 - spec/element_spec.rb
 - spec/feature_spec.rb
+- spec/includes_spec.rb
 - spec/page_spec.rb
 - spec/spec_helper.rb