bbc-capybara-mechanize 0.4.1 → 0.4.2

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.
Files changed (4) hide show
  1. data/lib/capybara/mechanize/browser.rb +8 -3
  2. data/lib/capybara/mechanize/version.rb +1 -1
  3. data/spec/session/mechanize_spec.rb +1 -0
  4. metadata +13 -13
data/lib/capybara/mechanize/browser.rb CHANGED
@@ -14,9 +14,14 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
14
14
  @agent.redirect_ok = false
15
15
  @agent.user_agent = default_user_agent
16
16
  if !driver.options.empty?
17
- if driver.options[:certificate] && driver.options[:certificate][:key] && driver.options[:certificate][:cer]
18
- @agent.cert = driver.options[:certificate][:cer]
19
- @agent.key = driver.options[:certificate][:key]
17
+ if driver.options[:certificate]
18
+ if !driver.options[:certificate].is_a? Hash
19
+ @agent.cert = driver.options[:certificate].certificate
20
+ @agent.key = driver.options[:certificate].key
21
+ elsif driver.options[:certificate][:key] && driver.options[:certificate][:cer]
22
+ @agent.cert = driver.options[:certificate][:cer]
23
+ @agent.key = driver.options[:certificate][:key]
24
+ end
20
25
  end
21
26
  if driver.options[:user_agent]
22
27
  @agent.user_agent = driver.options[:user_agent]
data/lib/capybara/mechanize/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Capybara
2
2
  module Mechanize
3
- VERSION = '0.4.1'
3
+ VERSION = '0.4.2'
4
4
  end
5
5
  end
data/spec/session/mechanize_spec.rb CHANGED
@@ -94,4 +94,5 @@ describe Capybara::Session do
94
94
  end
95
95
 
96
96
  end
97
+
97
98
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bbc-capybara-mechanize
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 11
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
- - 1
10
- version: 0.4.1
9
+ - 2
10
+ version: 0.4.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jeroen van Dijk
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2012-03-30 00:00:00 Z
19
+ date: 2012-05-30 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  version_requirements: &id001 !ruby/object:Gem::Requirement
@@ -24,16 +24,16 @@ dependencies:
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- hash: 23
27
+ hash: 25
28
28
  segments:
29
+ - 2
30
+ - 5
29
31
  - 1
30
- - 0
31
- - 0
32
- version: 1.0.0
32
+ version: 2.5.1
33
33
  prerelease: false
34
- requirement: *id001
35
- name: mechanize
36
34
  type: :runtime
35
+ name: mechanize
36
+ requirement: *id001
37
37
  - !ruby/object:Gem::Dependency
38
38
  version_requirements: &id002 !ruby/object:Gem::Requirement
39
39
  none: false
@@ -47,9 +47,9 @@ dependencies:
47
47
  - 2
48
48
  version: 1.1.2
49
49
  prerelease: false
50
- requirement: *id002
51
- name: capybara
52
50
  type: :runtime
51
+ name: capybara
52
+ requirement: *id002
53
53
  description: RackTest driver for Capybara, but with remote request support thanks to mechanize
54
54
  email: jeroen@jeevidee.nl
55
55
  executables: []
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
100
100
  requirements: []
101
101
 
102
102
  rubyforge_project:
103
- rubygems_version: 1.8.15
103
+ rubygems_version: 1.8.24
104
104
  signing_key:
105
105
  specification_version: 3
106
106
  summary: RackTest driver for Capybara with remote request support