capybara 1.1.3 → 1.1.4

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 (3) hide show
  1. data/lib/capybara/node/finders.rb +13 -13
  2. data/lib/capybara/version.rb +1 -1
  3. metadata +94 -29
data/lib/capybara/node/finders.rb CHANGED
@@ -112,7 +112,7 @@ module Capybara
112
112
 
113
113
  selector.xpaths.
114
114
  map { |path| find_in_base(selector, path) }.flatten.
115
- select { |node| matches_options(node, options) }
115
+ select { |node| node.without_wait { matches_options(node, options) } }
116
116
  end
117
117
 
118
118
  ##
@@ -135,9 +135,11 @@ module Capybara
135
135
 
136
136
  selector.xpaths.each do |path|
137
137
  find_in_base(selector, path).each do |node|
138
- if matches_options(node, options)
139
- found_elements << node
140
- return found_elements.last if not Capybara.prefer_visible_elements or node.visible?
138
+ node.without_wait do
139
+ if matches_options(node, options)
140
+ found_elements << node
141
+ return found_elements.last if not Capybara.prefer_visible_elements or node.visible?
142
+ end
141
143
  end
142
144
  end
143
145
  end
@@ -179,15 +181,13 @@ module Capybara
179
181
  end
180
182
 
181
183
  def matches_options(node, options)
182
- node.without_wait do
183
- return false if options[:text] and not node.text.match(options[:text])
184
- return false if options[:visible] and not node.visible?
185
- return false if options[:with] and not node.value == options[:with]
186
- return false if options[:checked] and not node.checked?
187
- return false if options[:unchecked] and node.checked?
188
- return false if options[:selected] and not has_selected_options?(node, options[:selected])
189
- true
190
- end
184
+ return false if options[:text] and not node.text.match(options[:text])
185
+ return false if options[:visible] and not node.visible?
186
+ return false if options[:with] and not node.value == options[:with]
187
+ return false if options[:checked] and not node.checked?
188
+ return false if options[:unchecked] and node.checked?
189
+ return false if options[:selected] and not has_selected_options?(node, options[:selected])
190
+ true
191
191
  end
192
192
 
193
193
  def has_selected_options?(node, expected)
data/lib/capybara/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Capybara
2
- VERSION = '1.1.3'
2
+ VERSION = '1.1.4'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capybara
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
4
+ version: 1.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-30 00:00:00.000000000 Z
12
+ date: 2012-11-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
16
- requirement: &2151926160 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: 1.3.3
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2151926160
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: 1.3.3
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: mime-types
27
- requirement: &2151922440 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '1.16'
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *2151922440
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '1.16'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: selenium-webdriver
38
- requirement: &2151935300 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ~>
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '2.0'
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *2151935300
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '2.0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: rack
49
- requirement: &2151934440 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: 1.0.0
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *2151934440
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: 1.0.0
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: rack-test
60
- requirement: &2151933220 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: 0.5.4
66
86
  type: :runtime
67
87
  prerelease: false
68
- version_requirements: *2151933220
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: 0.5.4
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: xpath
71
- requirement: &2151943440 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ~>
@@ -76,10 +101,15 @@ dependencies:
76
101
  version: 0.1.4
77
102
  type: :runtime
78
103
  prerelease: false
79
- version_requirements: *2151943440
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: 0.1.4
80
110
  - !ruby/object:Gem::Dependency
81
111
  name: sinatra
82
- requirement: &2151942160 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
83
113
  none: false
84
114
  requirements:
85
115
  - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
87
117
  version: 0.9.4
88
118
  type: :development
89
119
  prerelease: false
90
- version_requirements: *2151942160
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: 0.9.4
91
126
  - !ruby/object:Gem::Dependency
92
127
  name: rspec
93
- requirement: &2151941460 !ruby/object:Gem::Requirement
128
+ requirement: !ruby/object:Gem::Requirement
94
129
  none: false
95
130
  requirements:
96
131
  - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
98
133
  version: 2.0.0
99
134
  type: :development
100
135
  prerelease: false
101
- version_requirements: *2151941460
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: 2.0.0
102
142
  - !ruby/object:Gem::Dependency
103
143
  name: launchy
104
- requirement: &2151940240 !ruby/object:Gem::Requirement
144
+ requirement: !ruby/object:Gem::Requirement
105
145
  none: false
106
146
  requirements:
107
147
  - - ~>
@@ -109,10 +149,15 @@ dependencies:
109
149
  version: 2.0.4
110
150
  type: :development
111
151
  prerelease: false
112
- version_requirements: *2151940240
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ~>
156
+ - !ruby/object:Gem::Version
157
+ version: 2.0.4
113
158
  - !ruby/object:Gem::Dependency
114
159
  name: yard
115
- requirement: &2151939320 !ruby/object:Gem::Requirement
160
+ requirement: !ruby/object:Gem::Requirement
116
161
  none: false
117
162
  requirements:
118
163
  - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
120
165
  version: 0.5.8
121
166
  type: :development
122
167
  prerelease: false
123
- version_requirements: *2151939320
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
170
+ requirements:
171
+ - - ! '>='
172
+ - !ruby/object:Gem::Version
173
+ version: 0.5.8
124
174
  - !ruby/object:Gem::Dependency
125
175
  name: fuubar
126
- requirement: &2151938480 !ruby/object:Gem::Requirement
176
+ requirement: !ruby/object:Gem::Requirement
127
177
  none: false
128
178
  requirements:
129
179
  - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
131
181
  version: 0.0.1
132
182
  type: :development
133
183
  prerelease: false
134
- version_requirements: *2151938480
184
+ version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
186
+ requirements:
187
+ - - ! '>='
188
+ - !ruby/object:Gem::Version
189
+ version: 0.0.1
135
190
  - !ruby/object:Gem::Dependency
136
191
  name: cucumber
137
- requirement: &2151937200 !ruby/object:Gem::Requirement
192
+ requirement: !ruby/object:Gem::Requirement
138
193
  none: false
139
194
  requirements:
140
195
  - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
142
197
  version: '0.10'
143
198
  type: :development
144
199
  prerelease: false
145
- version_requirements: *2151937200
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ! '>='
204
+ - !ruby/object:Gem::Version
205
+ version: '0.10'
146
206
  - !ruby/object:Gem::Dependency
147
207
  name: rake
148
- requirement: &2151936560 !ruby/object:Gem::Requirement
208
+ requirement: !ruby/object:Gem::Requirement
149
209
  none: false
150
210
  requirements:
151
211
  - - ! '>='
@@ -153,7 +213,12 @@ dependencies:
153
213
  version: '0'
154
214
  type: :development
155
215
  prerelease: false
156
- version_requirements: *2151936560
216
+ version_requirements: !ruby/object:Gem::Requirement
217
+ none: false
218
+ requirements:
219
+ - - ! '>='
220
+ - !ruby/object:Gem::Version
221
+ version: '0'
157
222
  description: Capybara is an integration testing tool for rack based web applications.
158
223
  It simulates how a user would interact with a website
159
224
  email:
@@ -289,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
289
354
  version: '0'
290
355
  requirements: []
291
356
  rubyforge_project: capybara
292
- rubygems_version: 1.8.10
357
+ rubygems_version: 1.8.24
293
358
  signing_key:
294
359
  specification_version: 3
295
360
  summary: Capybara aims to simplify the process of integration testing Rack applications,