frameworks-capybara 0.2.15 → 0.2.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile.lock +1 -5
- data/frameworks-capybara.gemspec +0 -1
- data/lib/frameworks/capybara.rb +0 -9
- data/lib/frameworks/cucumber.rb +1 -6
- data/lib/version.rb +1 -1
- data/spec/frameworks_capybara_spec.rb +1 -14
- metadata +5 -19
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
frameworks-capybara (0.2.
|
4
|
+
frameworks-capybara (0.2.16)
|
5
5
|
capybara (>= 1.0.0)
|
6
6
|
capybara-celerity
|
7
7
|
capybara-mechanize (>= 0.3.0)
|
@@ -28,9 +28,6 @@ GEM
|
|
28
28
|
capybara-mechanize (0.3.0)
|
29
29
|
capybara (~> 1.1)
|
30
30
|
mechanize (~> 2.3)
|
31
|
-
capybara-webkit (0.12.1)
|
32
|
-
capybara (>= 1.0.0, < 1.2)
|
33
|
-
json
|
34
31
|
celerity (0.9.2)
|
35
32
|
childprocess (0.3.3)
|
36
33
|
ffi (~> 1.0.6)
|
@@ -95,7 +92,6 @@ PLATFORMS
|
|
95
92
|
ruby
|
96
93
|
|
97
94
|
DEPENDENCIES
|
98
|
-
capybara-webkit
|
99
95
|
frameworks-capybara!
|
100
96
|
jruby-openssl
|
101
97
|
rake
|
data/frameworks-capybara.gemspec
CHANGED
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
|
|
27
27
|
s.add_runtime_dependency("capybara-celerity")
|
28
28
|
s.add_runtime_dependency("w3c_validators")
|
29
29
|
s.add_runtime_dependency("cucumber", [">= 0.10.5"])
|
30
|
-
s.add_development_dependency("capybara-webkit")
|
31
30
|
s.add_development_dependency("rake")
|
32
31
|
s.add_development_dependency("rspec", [">=1.0.0"])
|
33
32
|
end
|
data/lib/frameworks/capybara.rb
CHANGED
@@ -8,7 +8,6 @@ require 'monkey-patches/net-http-persistent-patches'
|
|
8
8
|
require 'selenium-webdriver'
|
9
9
|
require 'capybara/mechanize/cucumber'
|
10
10
|
require 'capybara/celerity'
|
11
|
-
require 'capybara-webkit'
|
12
11
|
|
13
12
|
class CapybaraSetup
|
14
13
|
|
@@ -54,8 +53,6 @@ class CapybaraSetup
|
|
54
53
|
@driver = register_celerity_driver(capybara_opts)
|
55
54
|
when :mechanize then
|
56
55
|
@driver = register_mechanize_driver(capybara_opts)
|
57
|
-
when :webkit then
|
58
|
-
@driver = register_webkit_driver(capybara_opts)
|
59
56
|
else
|
60
57
|
@driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
|
61
58
|
end
|
@@ -165,12 +162,6 @@ class CapybaraSetup
|
|
165
162
|
:mechanize
|
166
163
|
end
|
167
164
|
|
168
|
-
def register_webkit_driver(opts)
|
169
|
-
Capybara.register_driver :webkit do |app|
|
170
|
-
Capybara::Driver::Webkit.new(app)
|
171
|
-
end
|
172
|
-
:webkit
|
173
|
-
end
|
174
165
|
|
175
166
|
def clean_opts(opts, *args)
|
176
167
|
args.each do |arg|
|
data/lib/frameworks/cucumber.rb
CHANGED
@@ -3,7 +3,7 @@ require 'w3c_validators'
|
|
3
3
|
require 'monkey-patches/cucumber-patches'
|
4
4
|
|
5
5
|
#This is hackish but means we only run once in cucumber and not every scenario
|
6
|
-
if(ENV['XVFB']=='true'
|
6
|
+
if(ENV['XVFB']=='true')
|
7
7
|
puts "You have chosen to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
|
8
8
|
require 'headless'
|
9
9
|
headless = Headless.new
|
@@ -117,11 +117,6 @@ Before do
|
|
117
117
|
page.driver.browser.agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
118
118
|
end
|
119
119
|
|
120
|
-
#TODO: See if this can be set at the driver level rather than in before do - and only want to start headless once
|
121
|
-
if page.driver.class == Capybara::Driver::Webkit
|
122
|
-
page.driver.browser.set_proxy(:host => http_proxy.scan(/http:\/\/(.*):80/).to_s,:port => '80') if http_proxy
|
123
|
-
end
|
124
|
-
|
125
120
|
generate_base_urls
|
126
121
|
end
|
127
122
|
|
data/lib/version.rb
CHANGED
@@ -450,20 +450,7 @@ describe CapybaraSetup do
|
|
450
450
|
|
451
451
|
end
|
452
452
|
|
453
|
-
|
454
|
-
context "with minimal Webkit driver" do
|
455
|
-
before do
|
456
|
-
ENV['BROWSER'] = 'webkit'
|
457
|
-
end
|
458
|
-
|
459
|
-
it "should be initialized correctly" do
|
460
|
-
Capybara.delete_session
|
461
|
-
CapybaraSetup.new.driver.should == :webkit
|
462
|
-
Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Webkit
|
463
|
-
end
|
464
|
-
end
|
465
|
-
end
|
466
|
-
|
453
|
+
|
467
454
|
end
|
468
455
|
end
|
469
456
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: frameworks-capybara
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 55
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 0.2.
|
9
|
+
- 16
|
10
|
+
version: 0.2.16
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- matt robbins
|
@@ -133,26 +133,12 @@ dependencies:
|
|
133
133
|
segments:
|
134
134
|
- 0
|
135
135
|
version: "0"
|
136
|
-
name:
|
136
|
+
name: rake
|
137
137
|
version_requirements: *id008
|
138
138
|
prerelease: false
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
type: :development
|
141
141
|
requirement: &id009 !ruby/object:Gem::Requirement
|
142
|
-
none: false
|
143
|
-
requirements:
|
144
|
-
- - ">="
|
145
|
-
- !ruby/object:Gem::Version
|
146
|
-
hash: 3
|
147
|
-
segments:
|
148
|
-
- 0
|
149
|
-
version: "0"
|
150
|
-
name: rake
|
151
|
-
version_requirements: *id009
|
152
|
-
prerelease: false
|
153
|
-
- !ruby/object:Gem::Dependency
|
154
|
-
type: :development
|
155
|
-
requirement: &id010 !ruby/object:Gem::Requirement
|
156
142
|
none: false
|
157
143
|
requirements:
|
158
144
|
- - ">="
|
@@ -164,7 +150,7 @@ dependencies:
|
|
164
150
|
- 0
|
165
151
|
version: 1.0.0
|
166
152
|
name: rspec
|
167
|
-
version_requirements: *
|
153
|
+
version_requirements: *id009
|
168
154
|
prerelease: false
|
169
155
|
description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
|
170
156
|
email:
|