swamp 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75a81ad2f5980818dc56e8a9142268169597d0a
-  data.tar.gz: 762d89066107e05871ef922878edc4127cbb7d26
+  metadata.gz: 847a3ad24ced1c7638928fb5ede6945aa0e45b5c
+  data.tar.gz: b1bfa972a7c19a3022e75e18c006ed37f69f6f57
 SHA512:
-  metadata.gz: 8487ad90dd5a1a27c3afa5678fbb39884a7517832cb062cc26c06aa4378fa475eedade961a6efa4b4ed48d9abfe5aa710f200fde997675453c783bcf081dae41
-  data.tar.gz: dad587976af09e6837e65dbd0ae6951733839b94f5120ce03416ebe39350bdea58679b3d856de119c4a0615e0c1a8e17a0c0cea1702e14a66804909577b1b7fa
+  metadata.gz: 8a048407fe8e70e48cbb7d546b7192f602f7b3a45b410c971357c26b099b24ed425ef9064d7df292a844cde56a2f045432b914aa9d65b163cf3533c6ab2f7099
+  data.tar.gz: 2544657716ca5091ae0ffbee4cad07357eac354d4d01dfe1ada3f273d7b6acad60289faeafb7975fe0ebf3f8ff3de63b9ceeab9018f32233d8caa4a253369a7d

data/features/step_definitions/swamp_steps.rb

@@ -6,7 +6,7 @@ When /^(?:I start it|that swamp is already running)$/ do
 end
 
 Then /^I should see "(.*?)"$/ do |outcome|
-  fake_output.messages.should include(outcome)
+  expect(fake_output.messages).to include(outcome)
 end
 
 Given /^I enter the url for this page: "(\w+\.html)"$/ do |page|
@@ -25,15 +25,15 @@ When /^I attempt to scan this page: "(\w+\.html)"$/ do |page|
 end
 
 Then /^(?:swamp|it) should output the following code snippets?$/ do |string|
-  fake_output.messages.should include(string)
+  expect(fake_output.messages).to include(string)
 end
 
 Then /^swamp should not output any snippet$/ do
-  fake_output.messages.size.should <= 3
+  expect(fake_output.messages.size).to be <= 3
   fake_output.messages.each do |m|
-    m.should_not include("def")
-    m.should_not include("source.")
-    m.should_not include("page.")
+    expect(m).not_to include("def")
+    expect(m).not_to include("source.")
+    expect(m).not_to include("page.")
   end
 end
 
@@ -42,7 +42,7 @@ Given /^that swamp already have scanned a page$/ do
   path = File.join(File.dirname(__FILE__), '../support/page_examples/', "button.html")
   @url = "file://#{path}"
   swamp.scan(@url)
-  fake_output.messages.should include("def sign_up\n  page.click_button(\"Sign Up\")\nend")
+  expect(fake_output.messages).to include("def sign_up\n  page.click_button(\"Sign Up\")\nend")
 end
 
 When /^I attempt to hit enter at the terminal$/ do
@@ -50,19 +50,19 @@ When /^I attempt to hit enter at the terminal$/ do
 end
 
 Then /^swamp should scan the current page$/ do
-  fake_output.messages.size.should <= 5
-  fake_output.messages[3].should == "Scanning, please wait..."
-  fake_output.messages[4].should == "def sign_up\n  page.click_button(\"Sign Up\")\nend"
+  expect(fake_output.messages.size).to be <= 5
+  expect(fake_output.messages[3]).to eq "Scanning, please wait..."
+  expect(fake_output.messages[4]).to eq "def sign_up\n  page.click_button(\"Sign Up\")\nend"
 end
 
 Then /^swamp should highlight this (element|link): "(.+)"$/ do |mode, selector|
   page = Capybara.current_session
-  page.should have_css "#{selector}[style]"
+  expect(page).to have_css "#{selector}[style]"
   if mode == "element"
-    page.find(selector)[:style].should include("border-width: 3px")
-    page.find(selector)[:style].should include("border-color: rgb(255, 0, 0)")
+    expect(page.find(selector)[:style]).to include("border-width: 3px")
+    expect(page.find(selector)[:style]).to include("border-color: rgb(255, 0, 0)")
   else
-    page.find(selector)[:style].should include("background-color: rgb(255, 0, 0)")
+    expect(page.find(selector)[:style]).to include("background-color: rgb(255, 0, 0)")
   end
 end
 

data/lib/swamp/version.rb

@@ -1,3 +1,3 @@
 module Swamp
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/lib/swamp/wrapper.rb

@@ -18,9 +18,14 @@ module Swamp
     def scan
       found_snippets = []
       @meta_collection.each do | element_collection |
-        found_snippets += element_collection.get.map { | element | @setup.builder.build_snippet(element) }
+        found_snippets += element_collection.get.map { | element | build_snippet(element) }
       end
       found_snippets
     end
+
+    private
+    def build_snippet(element)
+      @setup.builder.build_snippet(element)
+    end
   end
 end

data/swamp.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "capybara", '~> 2.4'
-  spec.add_dependency "selenium-webdriver", '~> 2.43'
+  spec.add_dependency "selenium-webdriver", '~> 2.46'
 
   spec.add_development_dependency "bundler", '~> 1.6'
   spec.add_development_dependency "rake", '~> 10.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swamp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Juraci de Lima Vieira Neto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.43'
+        version: '2.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.43'
+        version: '2.46'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement