swamp 1.2.0 → 1.3.0

data/lib/swamp.rb

@@ -4,22 +4,27 @@ require 'swamp/setup'
 require 'swamp/interface'
 require 'swamp/evaluator'
 require 'swamp/base'
-require 'swamp/elements'
+require 'swamp/collections/elements'
 require 'swamp/wrapper'
-require 'swamp/element'
-require 'swamp/fields'
-require 'swamp/field'
-require 'swamp/buttons'
-require 'swamp/button'
-require 'swamp/builder'
+require 'swamp/elements/element'
+require 'swamp/collections/fields'
+require 'swamp/elements/field'
+require 'swamp/collections/buttons'
+require 'swamp/elements/button'
+require 'swamp/builders/basic'
+require 'swamp/builders/prism'
 require 'swamp/formatter'
-require 'swamp/input_buttons'
-require 'swamp/input_button'
-require 'swamp/select_boxes'
-require 'swamp/select_box'
-require 'swamp/complex_select_box'
-require 'swamp/links'
-require 'swamp/link'
+require 'swamp/collections/input_buttons'
+require 'swamp/elements/input_button'
+require 'swamp/collections/select_boxes'
+require 'swamp/elements/select_box'
+require 'swamp/elements/complex_select_box'
+require 'swamp/collections/links'
+require 'swamp/elements/link'
+require 'swamp/scopes/source'
+require 'swamp/scopes/page'
+require 'swamp/scopes/prism'
+require 'swamp/scopes/scope'
 
 module Swamp
 end

data/spec/swamp/builders/basic_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+module Swamp
+  module Builders
+    describe Basic do
+      let(:builder) { Swamp::Builders::Basic.new('page') }
+      let(:source_builder) { Swamp::Builders::Basic.new('source') }
+
+      describe "#build_snippet" do
+        context "when the type is field" do
+          context "when the name and the selector are present" do
+            it "returns the method's snippet" do
+              element = Swamp::Field.new("User-Name", "User-Name")
+              expect(builder.build_snippet(element)).to eq("def type_user_name(input)\n  page.fill_in(\"User-Name\", with: input)\nend")
+            end
+          end
+        end
+
+        context "when the type is button" do
+          context "when the name and the selector are present" do
+            it "returns the method's snippet" do
+              element = Swamp::Button.new("Log_in", "Log_in")
+              expect(builder.build_snippet(element)).to eq("def log_in\n  page.click_button(\"Log_in\")\nend")
+            end
+          end
+
+          context "when just the selector is present" do
+            it "returns just the selector snippet" do
+              element = Swamp::Button.new(nil, "$ 9.90 Buy")
+              expect(builder.build_snippet(element)).to eq("page.click_button(\"$ 9.90 Buy\")")
+            end
+          end
+
+          context "when the scope has changed" do
+            it "returns the method's snippet with the changed scope" do
+              element = Swamp::Button.new("Log_in", "Log_in")
+              expect(source_builder.build_snippet(element)).to eq("def log_in\n  source.click_button(\"Log_in\")\nend")
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/spec/swamp/builders/prism_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module Swamp
+  module Builders
+    describe Prism do
+      let(:builder) { Swamp::Builders::Prism.new }
+
+      describe "#build_snippet" do
+        it "returns the method's snippet" do
+          element = Swamp::Button.new("User-Name", "User-Name")
+          element.prism_selector = "'#User-Name'"
+          expect(builder.build_snippet(element)).to eq("element :user_name, '#User-Name'")
+        end
+      end
+    end
+  end
+end

data/spec/swamp/buttons_spec.rb

@@ -30,8 +30,9 @@ module Swamp
         it "returns the element in the array using the text as both the name and the selector" do
           allow(buttons.page).to receive(:execute_script).and_return(nil)
           expect(buttons.get.size).to eq(1)
-          expect(buttons.get.each.first.name).to eq("Sign Up")
-          expect(buttons.get.each.first.selector).to eq("Sign Up")
+          expect(buttons.get.first.name).to eq("Sign Up")
+          expect(buttons.get.first.selector).to eq("Sign Up")
+          expect(buttons.get.first.prism_selector).to eq(%\'button', text: 'Sign Up'\)
         end
       end
 
@@ -53,8 +54,9 @@ module Swamp
           it "returns the element in the array using the id as both the name and the selector" do
             allow(buttons.page).to receive(:execute_script).and_return(nil)
             expect(buttons.get.size).to eq(1)
-            expect(buttons.get.each.first.name).to eq("search-button")
-            expect(buttons.get.each.first.selector).to eq("search-button")
+            expect(buttons.get.first.name).to eq("search-button")
+            expect(buttons.get.first.selector).to eq("search-button")
+            expect(buttons.get.first.prism_selector).to eq("'#search-button'")
           end
         end
 
@@ -78,6 +80,7 @@ module Swamp
               expect(buttons.get.size).to eq(1)
               expect(buttons.get.each.first.name).to eq("search-button")
               expect(buttons.get.each.first.selector).to eq("search-button")
+              expect(buttons.get.each.first.prism_selector).to eq(%\"[value='search-button']"\)
             end
           end
 

data/spec/swamp/fields_spec.rb

@@ -38,6 +38,7 @@ module Swamp
             allow(fields.page).to receive(:execute_script).and_return(nil)
             expect(fields.get.size).to eq(1)
             expect(fields.get.first.selector).to eq("u_0_b")
+            expect(fields.get.first.prism_selector).to eq("'#u_0_b'")
           end
         end
 
@@ -64,6 +65,7 @@ module Swamp
             allow(fields.page).to receive(:execute_script).and_return(nil)
             expect(fields.get.size).to eq(1)
             expect(fields.get.first.selector).to eq("username")
+            expect(fields.get.first.prism_selector).to eq("'#username'")
           end
         end
 
@@ -90,6 +92,7 @@ module Swamp
             allow(fields.page).to receive(:execute_script).and_return(nil)
             expect(fields.get.size).to eq(1)
             expect(fields.get.first.selector).to eq("username")
+            expect(fields.get.first.prism_selector).to eq(%/'input[name="username"]'/)
           end
         end
       end

data/spec/swamp/input_buttons_spec.rb

@@ -61,6 +61,7 @@ module Swamp
           allow(input_buttons.page).to receive(:execute_script).and_return(nil)
           expect(input_buttons.get.size).to eq(1)
           expect(input_buttons.get.first.selector).to eq("input.btn.without.id[value='Log In']")
+          expect(input_buttons.get.first.prism_selector).to eq(%\"input.btn.without.id[value='Log In']"\)
         end
       end
     end

data/spec/swamp/links_spec.rb

@@ -35,6 +35,7 @@ module Swamp
           allow(links.page).to receive(:execute_script).and_return(nil)
           expect(links.get.size).to eq(1)
           expect(links.get.first.selector).to eq("forgot-password")
+          expect(links.get.first.prism_selector).to eq("'#forgot-password'")
         end
       end
     end

data/spec/swamp/select_boxes_spec.rb

@@ -35,6 +35,7 @@ module Swamp
           allow(select_boxes.page).to receive(:execute_script).and_return(nil)
           expect(select_boxes.get.size).to eq(1)
           expect(select_boxes.get.first.selector).to eq("month")
+          expect(select_boxes.get.first.prism_selector).to eq("'#month'")
         end
       end
 
@@ -61,6 +62,7 @@ module Swamp
           allow(select_boxes.page).to receive(:execute_script).and_return(nil)
           expect(select_boxes.get.size).to eq(1)
           expect(select_boxes.get.first.selector).to eq("birthday_month")
+          expect(select_boxes.get.first.prism_selector).to eq(%\"select[name='birthday_month']"\)
         end
       end
 
@@ -87,6 +89,7 @@ module Swamp
           allow(select_boxes.page).to receive(:execute_script).and_return(nil)
           expect(select_boxes.get.size).to eq(1)
           expect(select_boxes.get.first.selector).to eq("provider-select")
+          expect(select_boxes.get.first.prism_selector).to eq("'select.provider-select'")
         end
       end
     end

data/spec/swamp/setup_spec.rb

@@ -2,17 +2,24 @@ require 'spec_helper'
 module Swamp
   describe Setup do
     let(:setup) { Swamp::Setup.new }
+    let(:source_scope) { Swamp::Scope::Source.new }
+    let(:page_scope) { Swamp::Scope::Page.new }
+
+    before :each do
+      allow(Swamp::Scope).to receive(:from_value).with('source').and_return(source_scope)
+      allow(Swamp::Scope).to receive(:from_value).with('page').and_return(page_scope)
+    end
 
     it "should set the default options" do
-      expect(setup.scope).to eq("page")
+      expect(setup.scope).to eq(page_scope)
     end
 
     describe "#handle_command" do
       context "when the command is valid" do
         context "when the scope changes" do
-          it "should set the option :scope to source" do
+          it "should set the option :scope" do
             setup.handle_command(":scope = source")
-            expect(setup.scope).to eq("source")
+            expect(setup.scope).to eq(source_scope)
           end
 
           it "should return a message confirming the scope was set to source" do
@@ -21,7 +28,7 @@ module Swamp
 
           it "should set the option :scope to page" do
             setup.handle_command(":scope = page")
-            expect(setup.scope).to eq("page")
+            expect(setup.scope).to eq(page_scope)
           end
 
           it "should return a message confirming the scope was set to page" do

data/swamp.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["juraci.vieira@gmail.com"]
   spec.description   = "Automatically generates the methods and selectors to help on faster page-object creation using capybara"
   spec.summary       = "Swamp, where capybaras belong"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/Juraci/swamp"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capybara"
-  spec.add_dependency "selenium-webdriver"
+  spec.add_dependency "capybara", '~> 2.4'
+  spec.add_dependency "selenium-webdriver", '~> 2.43'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "json"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-nav"
+  spec.add_development_dependency "bundler", '~> 1.6'
+  spec.add_development_dependency "rake", '~> 10.3'
+  spec.add_development_dependency "rspec", '~> 3'
+  spec.add_development_dependency "cucumber", '~> 1.3'
+  spec.add_development_dependency "json", '~> 1.8'
+  spec.add_development_dependency "pry", '~> 0.9'
+  spec.add_development_dependency "pry-nav", '~> 0.2'
+  spec.add_development_dependency "guard", '~> 2.6'
+  spec.add_development_dependency "guard-rspec", '~> 4.3'
 end

metadata

@@ -1,141 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: swamp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Juraci de Lima Vieira Neto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.43'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 description: Automatically generates the methods and selectors to help on faster page-object
   creation using capybara
 email:
@@ -147,11 +175,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/swamp
+- features/specifications/changing_scope_to_source.feature
 - features/specifications/scope_changing.feature
 - features/specifications/user_scans_a_page_interactively.feature
 - features/specifications/user_scans_buttons_in_a_page.feature
@@ -160,6 +191,7 @@ files:
 - features/specifications/user_scans_links_in_a_page.feature
 - features/specifications/user_scans_select_box_elements_in_a_page.feature
 - features/specifications/user_starts_swamp.feature
+- features/specifications/using_prism_scope.feature
 - features/step_definitions/swamp_steps.rb
 - features/support/env.rb
 - features/support/page_examples/button.html
@@ -185,28 +217,34 @@ files:
 - lib/swamp.rb
 - lib/swamp/assertions.rb
 - lib/swamp/base.rb
-- lib/swamp/builder.rb
-- lib/swamp/button.rb
-- lib/swamp/buttons.rb
-- lib/swamp/complex_select_box.rb
-- lib/swamp/element.rb
-- lib/swamp/elements.rb
+- lib/swamp/builders/basic.rb
+- lib/swamp/builders/prism.rb
+- lib/swamp/collections/buttons.rb
+- lib/swamp/collections/elements.rb
+- lib/swamp/collections/fields.rb
+- lib/swamp/collections/input_buttons.rb
+- lib/swamp/collections/links.rb
+- lib/swamp/collections/select_boxes.rb
+- lib/swamp/elements/button.rb
+- lib/swamp/elements/complex_select_box.rb
+- lib/swamp/elements/element.rb
+- lib/swamp/elements/field.rb
+- lib/swamp/elements/input_button.rb
+- lib/swamp/elements/link.rb
+- lib/swamp/elements/select_box.rb
 - lib/swamp/evaluator.rb
-- lib/swamp/field.rb
-- lib/swamp/fields.rb
 - lib/swamp/formatter.rb
-- lib/swamp/input_button.rb
-- lib/swamp/input_buttons.rb
 - lib/swamp/interface.rb
-- lib/swamp/link.rb
-- lib/swamp/links.rb
-- lib/swamp/select_box.rb
-- lib/swamp/select_boxes.rb
+- lib/swamp/scopes/page.rb
+- lib/swamp/scopes/prism.rb
+- lib/swamp/scopes/scope.rb
+- lib/swamp/scopes/source.rb
 - lib/swamp/setup.rb
 - lib/swamp/version.rb
 - lib/swamp/wrapper.rb
 - spec/spec_helper.rb
-- spec/swamp/builder_spec.rb
+- spec/swamp/builders/basic_spec.rb
+- spec/swamp/builders/prism_spec.rb
 - spec/swamp/buttons_spec.rb
 - spec/swamp/evaluator_spec.rb
 - spec/swamp/fields_spec.rb
@@ -219,7 +257,7 @@ files:
 - spec/swamp/wrapper_spec.rb
 - swamp.gemspec
 - tags
-homepage: ''
+homepage: https://github.com/Juraci/swamp
 licenses:
 - MIT
 metadata: {}
@@ -244,6 +282,7 @@ signing_key:
 specification_version: 4
 summary: Swamp, where capybaras belong
 test_files:
+- features/specifications/changing_scope_to_source.feature
 - features/specifications/scope_changing.feature
 - features/specifications/user_scans_a_page_interactively.feature
 - features/specifications/user_scans_buttons_in_a_page.feature
@@ -252,6 +291,7 @@ test_files:
 - features/specifications/user_scans_links_in_a_page.feature
 - features/specifications/user_scans_select_box_elements_in_a_page.feature
 - features/specifications/user_starts_swamp.feature
+- features/specifications/using_prism_scope.feature
 - features/step_definitions/swamp_steps.rb
 - features/support/env.rb
 - features/support/page_examples/button.html
@@ -275,7 +315,8 @@ test_files:
 - features/support/page_examples/select_without_id_and_name.html
 - features/support/setup.rb
 - spec/spec_helper.rb
-- spec/swamp/builder_spec.rb
+- spec/swamp/builders/basic_spec.rb
+- spec/swamp/builders/prism_spec.rb
 - spec/swamp/buttons_spec.rb
 - spec/swamp/evaluator_spec.rb
 - spec/swamp/fields_spec.rb

data/lib/swamp/builder.rb

@@ -1,39 +0,0 @@
-module Swamp
-  class Builder
-
-    attr_reader :element
-
-    def initialize(element, setup)
-      @element = element
-      @setup = setup
-    end
-
-    def build_snippet
-      if element.name
-        [method_definition, element.method_signature, line_break, identation, scope, element.accessor, line_break, method_end].join
-      else
-        [scope, element.accessor].join
-      end
-    end
-
-    def method_definition
-      "def "
-    end
-
-    def method_end
-      "end"
-    end
-
-    def scope
-      [@setup.scope, "."].join
-    end
-
-    def identation
-      "  "
-    end
-
-    def line_break
-      "\n"
-    end
-  end
-end

data/lib/swamp/buttons.rb

@@ -1,22 +0,0 @@
-module Swamp
-  class Buttons < Elements
-    def get
-      elements = []
-      page.all("button").map do |element|
-        if element.visible?
-          if has_valid_text?(element)
-            shine %\//button[text()='#{element.text}']\, :xpath
-            elements << Swamp::Button.new(element.text, element.text)
-          elsif has_id?(element) and has_valid_id?(element)
-            shine %/##{element["id"]}/
-            elements << Swamp::Button.new(element["id"], element["id"])
-          elsif has_value?(element) and has_valid_value?(element)
-            shine %/button[value='#{element["value"]}']/
-            elements << Swamp::Button.new(element["value"], element["value"])
-          end
-        end
-      end
-      elements
-    end
-  end
-end