calabash-cucumber 0.11.4 → 0.11.5.pre2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9f35b46130d00873ebc65afa992b809afcac16f3
4
- data.tar.gz: b529c844b3b234fa59cb7818c6deaf7b3e5c26f6
3
+ metadata.gz: 292c9c88c06f29772a770fded22c6f1c5435bd6d
4
+ data.tar.gz: 017b1881d24c706aabf5fbfd7c536e162c931dd3
5
5
  SHA512:
6
- metadata.gz: 98dfebb1d8c9ec4d812d3d46206c057a06c65e48ffeea5c7fa2807af26006fefcc611c6ce664aebaad0c7bacdbdd83567e4db99ef297e1f248a4157a9158baed
7
- data.tar.gz: 010c95ce4ebc619e404fe9e50c5eb1cd759fcc40ae3b48149a76f2b4ca64f84aa6ff4969758f63c0d875c014163498b270912d1a9088bf15ea0e37beafd63b78
6
+ metadata.gz: b20f07d18068b94b5b5b89c12facc36ba665c08b2ace5c7aae5f8de0af5959d18a768eb7c51820f794a11167eb8092386fb3e8d7025fe80e40ce7a24507e0dcb
7
+ data.tar.gz: 3c3ec4de0e56d32d6d6ce873539cb3e2efb33172c436f4ab9b5d83659a29db92447d9d4e86f714a1786ecb8d57e6fb27a5e87a88c50a109063a7e0489f19cd89
Binary file
Binary file
@@ -84,22 +84,32 @@ module Calabash
84
84
 
85
85
  return true if device_family_iphone?
86
86
 
87
- # ipad
88
87
  rect = res['rect']
89
88
  o = status_bar_orientation.to_sym
90
89
  case o
91
- when :left then
92
- rect['center_x'] == 592 and rect['center_y'] == 512
93
- when :right then
94
- rect['center_x'] == 176 and rect['center_y'] == 512
95
- when :up then
96
- rect['center_x'] == 384 and rect['center_y'] == 132
97
- when :down then
98
- rect['center_x'] == 384 and rect['center_y'] == 892
90
+ when :left
91
+ if ios8?
92
+ rect['center_x'] == 512 and rect['center_y'] == 592
93
+ else
94
+ rect['center_x'] == 592 and rect['center_y'] == 512
95
+ end
96
+ when :right
97
+ if ios8?
98
+ rect['center_x'] == 512 and rect['center_y'] == 592
99
+ else
100
+ rect['center_x'] == 176 and rect['center_y'] == 512
101
+ end
102
+ when :up
103
+ if ios8?
104
+ rect['center_x'] == 384 and rect['center_y'] == 892
105
+ else
106
+ rect['center_x'] == 384 and rect['center_y'] == 132
107
+ end
108
+ when :down
109
+ rect['center_x'] == 384 and rect['center_y'] == 892
99
110
  else
100
111
  false
101
112
  end
102
-
103
113
  end
104
114
 
105
115
  # Returns true if an undocked keyboard is visible.
@@ -1,7 +1,5 @@
1
1
  require 'edn'
2
2
  require 'json'
3
- # required for ruby 1.8
4
- require 'enumerator'
5
3
  require 'calabash-cucumber/utils/logging'
6
4
 
7
5
  module Calabash
@@ -23,9 +21,11 @@ module Calabash
23
21
  raise ArgumentError, 'the current launcher must be active and be attached to a run_loop' unless run_loop
24
22
  raise ArgumentError, 'please supply :command' unless command
25
23
 
26
- case run_loop[:uia_strategy]
27
- when :preferences
28
- res = http({:method => :post, :path => 'uia'}, {:command => command}.merge(options))
24
+ strategy = run_loop[:uia_strategy]
25
+ case strategy
26
+ when :preferences, :shared_element
27
+ path = strategy == :preferences ? 'uia' : 'uia-shared'
28
+ res = http({:method => :post, :path => path}, {:command => command}.merge(options))
29
29
 
30
30
  begin
31
31
  res = JSON.parse(res)
@@ -38,9 +38,25 @@ module Calabash
38
38
  end
39
39
  res['results'].first
40
40
  when :host
41
- RunLoop.send_command(run_loop, command)
41
+ res = RunLoop.send_command(run_loop, command)
42
+ status = res['status']
43
+ case status
44
+ when 'success'
45
+ res
46
+ when 'error'
47
+ value = res['value']
48
+ if value
49
+ msg = "uia action failed because: #{res['value']}"
50
+ else
51
+ msg = 'uia action failed for an unknown reason'
52
+ end
53
+ raise msg
54
+ else
55
+ candidates = ['success', 'error']
56
+ raise RuntimeError, "expected '#{status}' to be one of #{candidates}"
57
+ end
42
58
  else
43
- candidates = [:preferences, :host]
59
+ candidates = [:preferences, :shared_element, :host]
44
60
  raise ArgumentError, "expected '#{run_loop[:uia_strategy]}' to be one of #{candidates}"
45
61
  end
46
62
  end
@@ -48,7 +64,15 @@ module Calabash
48
64
 
49
65
  # @!visibility private
50
66
  def uia_wait_tap(query, options={})
51
- res = http({:method => :post, :path => 'uia-tap'}, {:query => query}.merge(options))
67
+ launcher = Calabash::Cucumber::Launcher.launcher_if_used
68
+ run_loop = launcher && launcher.active? && launcher.run_loop
69
+ raise ArgumentError, 'the current launcher must be active and be attached to a run_loop' unless run_loop
70
+ raise ArgumentError, 'please supply :command' unless command
71
+
72
+ strategy = run_loop[:uia_strategy]
73
+ path = (strategy == :preferences ? 'uia-tap' : 'uia-tap-shared')
74
+
75
+ res = http({:method => :post, :path => path}, {:query => query}.merge(options))
52
76
  res = JSON.parse(res)
53
77
  if res['outcome'] != 'SUCCESS'
54
78
  raise "uia-tap action failed because: #{res['reason']}\n#{res['details']}"
@@ -3,11 +3,11 @@ module Calabash
3
3
 
4
4
  # @!visibility public
5
5
  # The Calabash iOS gem version.
6
- VERSION = '0.11.4'
6
+ VERSION = '0.11.5.pre2'
7
7
 
8
8
  # @!visibility public
9
9
  # The minimum required version of the calabash.framework or, for Xamarin
10
10
  # users, the Calabash component.
11
- MIN_SERVER_VERSION = '0.11.4'
11
+ MIN_SERVER_VERSION = '0.11.5.pre2'
12
12
  end
13
13
  end
Binary file
Binary file
metadata CHANGED
@@ -1,321 +1,321 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: calabash-cucumber
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.4
4
+ version: 0.11.5.pre2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Karl Krukow
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-06 00:00:00.000000000 Z
11
+ date: 2014-11-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cucumber
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 1.3.17
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 1.3.17
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: calabash-common
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.0.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.0.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: json
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: '1.8'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: '1.8'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: edn
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: 1.0.6
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
68
  version: 1.0.6
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: CFPropertyList
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: 2.2.8
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: 2.2.8
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sim_launcher
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
89
  version: 0.4.13
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ~>
95
95
  - !ruby/object:Gem::Version
96
96
  version: 0.4.13
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: slowhandcuke
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: 0.0.3
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: 0.0.3
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: geocoder
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
117
  version: 1.1.8
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - "~>"
122
+ - - ~>
123
123
  - !ruby/object:Gem::Version
124
124
  version: 1.1.8
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: httpclient
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ~>
130
130
  - !ruby/object:Gem::Version
131
131
  version: 2.3.3
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ~>
137
137
  - !ruby/object:Gem::Version
138
138
  version: 2.3.3
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: bundler
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - "~>"
143
+ - - ~>
144
144
  - !ruby/object:Gem::Version
145
145
  version: '1.3'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - "~>"
150
+ - - ~>
151
151
  - !ruby/object:Gem::Version
152
152
  version: '1.3'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: awesome_print
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - "~>"
157
+ - - ~>
158
158
  - !ruby/object:Gem::Version
159
159
  version: 1.2.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - "~>"
164
+ - - ~>
165
165
  - !ruby/object:Gem::Version
166
166
  version: 1.2.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: run_loop
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - "~>"
171
+ - - ~>
172
172
  - !ruby/object:Gem::Version
173
- version: 1.1.0
173
+ version: 1.1.1.pre3
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - "~>"
178
+ - - ~>
179
179
  - !ruby/object:Gem::Version
180
- version: 1.1.0
180
+ version: 1.1.1.pre3
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rake
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - "~>"
185
+ - - ~>
186
186
  - !ruby/object:Gem::Version
187
187
  version: '10.3'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - "~>"
192
+ - - ~>
193
193
  - !ruby/object:Gem::Version
194
194
  version: '10.3'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: rspec
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - "~>"
199
+ - - ~>
200
200
  - !ruby/object:Gem::Version
201
201
  version: '3.0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - "~>"
206
+ - - ~>
207
207
  - !ruby/object:Gem::Version
208
208
  version: '3.0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: yard
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - "~>"
213
+ - - ~>
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0.8'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - "~>"
220
+ - - ~>
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0.8'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: redcarpet
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - "~>"
227
+ - - ~>
228
228
  - !ruby/object:Gem::Version
229
229
  version: '3.1'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - "~>"
234
+ - - ~>
235
235
  - !ruby/object:Gem::Version
236
236
  version: '3.1'
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: pry
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - "~>"
241
+ - - ~>
242
242
  - !ruby/object:Gem::Version
243
243
  version: '0.9'
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - "~>"
248
+ - - ~>
249
249
  - !ruby/object:Gem::Version
250
250
  version: '0.9'
251
251
  - !ruby/object:Gem::Dependency
252
252
  name: pry-nav
253
253
  requirement: !ruby/object:Gem::Requirement
254
254
  requirements:
255
- - - "~>"
255
+ - - ~>
256
256
  - !ruby/object:Gem::Version
257
257
  version: '0.2'
258
258
  type: :development
259
259
  prerelease: false
260
260
  version_requirements: !ruby/object:Gem::Requirement
261
261
  requirements:
262
- - - "~>"
262
+ - - ~>
263
263
  - !ruby/object:Gem::Version
264
264
  version: '0.2'
265
265
  - !ruby/object:Gem::Dependency
266
266
  name: guard-rspec
267
267
  requirement: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - "~>"
269
+ - - ~>
270
270
  - !ruby/object:Gem::Version
271
271
  version: '4.3'
272
272
  type: :development
273
273
  prerelease: false
274
274
  version_requirements: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - "~>"
276
+ - - ~>
277
277
  - !ruby/object:Gem::Version
278
278
  version: '4.3'
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: guard-bundler
281
281
  requirement: !ruby/object:Gem::Requirement
282
282
  requirements:
283
- - - "~>"
283
+ - - ~>
284
284
  - !ruby/object:Gem::Version
285
285
  version: '2.0'
286
286
  type: :development
287
287
  prerelease: false
288
288
  version_requirements: !ruby/object:Gem::Requirement
289
289
  requirements:
290
- - - "~>"
290
+ - - ~>
291
291
  - !ruby/object:Gem::Version
292
292
  version: '2.0'
293
293
  - !ruby/object:Gem::Dependency
294
294
  name: growl
295
295
  requirement: !ruby/object:Gem::Requirement
296
296
  requirements:
297
- - - "~>"
297
+ - - ~>
298
298
  - !ruby/object:Gem::Version
299
299
  version: '1.0'
300
300
  type: :development
301
301
  prerelease: false
302
302
  version_requirements: !ruby/object:Gem::Requirement
303
303
  requirements:
304
- - - "~>"
304
+ - - ~>
305
305
  - !ruby/object:Gem::Version
306
306
  version: '1.0'
307
307
  - !ruby/object:Gem::Dependency
308
308
  name: stub_env
309
309
  requirement: !ruby/object:Gem::Requirement
310
310
  requirements:
311
- - - "~>"
311
+ - - ~>
312
312
  - !ruby/object:Gem::Version
313
313
  version: '0.2'
314
314
  type: :development
315
315
  prerelease: false
316
316
  version_requirements: !ruby/object:Gem::Requirement
317
317
  requirements:
318
- - - "~>"
318
+ - - ~>
319
319
  - !ruby/object:Gem::Version
320
320
  version: '0.2'
321
321
  description: calabash-cucumber drives tests for native iOS apps. You must link your
@@ -504,17 +504,17 @@ require_paths:
504
504
  - lib
505
505
  required_ruby_version: !ruby/object:Gem::Requirement
506
506
  requirements:
507
- - - ">="
507
+ - - '>='
508
508
  - !ruby/object:Gem::Version
509
509
  version: '1.9'
510
510
  required_rubygems_version: !ruby/object:Gem::Requirement
511
511
  requirements:
512
- - - ">="
512
+ - - '>'
513
513
  - !ruby/object:Gem::Version
514
- version: '0'
514
+ version: 1.3.1
515
515
  requirements: []
516
516
  rubyforge_project:
517
- rubygems_version: 2.4.2
517
+ rubygems_version: 2.4.1
518
518
  signing_key:
519
519
  specification_version: 4
520
520
  summary: Client for calabash-ios-server for automated functional testing on iOS