Skip to content

Commit 09329d1

Browse files
Name before_first/after_last for better error messages
1 parent 5302418 commit 09329d1

File tree

12 files changed

+45
-15
lines changed

12 files changed

+45
-15
lines changed

ios_tests/lib/ios/specs/common/device.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ def before_first
33
screen.must_equal catalog
44
end
55

6-
t { before_first }
6+
t 'before_first' do
7+
before_first
8+
end
79

810
t 'lock' do
911
lock 5

ios_tests/lib/ios/specs/common/element/button.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ def after_last
1212
back_click
1313
end
1414

15-
t { before_first }
15+
t 'before_first' do
16+
before_first
17+
end
1618

1719
def gray
1820
'Gray'
@@ -56,5 +58,7 @@ def gray
5658
button_num('in', 2).name.must_equal 'More info'
5759
end
5860

59-
t { after_last }
61+
t 'after_last' do
62+
after_last
63+
end
6064
end

ios_tests/lib/ios/specs/common/element/window.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ def before_first
55
screen.must_equal catalog
66
end
77

8-
t { before_first }
8+
t 'before_first' do
9+
before_first
10+
end
911

1012
t 'window_size' do
1113
size = window_size

ios_tests/lib/ios/specs/common/helper.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ def before_first
55
screen.must_equal catalog
66
end
77

8-
t { before_first }
8+
t 'before_first' do
9+
before_first
10+
end
911

1012
wait_time = [0.2, 0.2] # max_wait, interval
1113

ios_tests/lib/ios/specs/common/patch.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ def before_first
1111
screen.must_equal catalog
1212
end
1313

14-
t { before_first }
14+
t 'before_first' do
15+
before_first
16+
end
1517

1618
# Attributes are busted in Android.
1719
# Blocked on https://github.com/appium/appium/issues/628

ios_tests/lib/ios/specs/common/version.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ def before_first
55
screen.must_equal catalog
66
end
77

8-
t { before_first }
8+
t 'before_first' do
9+
before_first
10+
end
911

1012
t '::Appium::VERSION' do
1113
::Appium::VERSION.must_match /(\d+)\.(\d+).(\d+)/

ios_tests/lib/ios/specs/driver.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ def before_first
55
screen.must_equal catalog
66
end
77

8-
t { before_first }
8+
t 'before_first' do
9+
before_first
10+
end
911

1012
def is_sauce
1113
ENV['UPLOAD_FILE'] && ENV['SAUCE_USERNAME']

ios_tests/lib/ios/specs/ios/element/alert.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,7 @@ def ios7_alert_detected
7474
alert_dismiss
7575
end
7676

77-
t { after_last }
77+
t 'after_last' do
78+
after_last
79+
end
7880
end

ios_tests/lib/ios/specs/ios/element/text.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ def before_first
55
screen.must_equal catalog
66
end
77

8-
t { before_first }
8+
t 'before_first' do
9+
before_first
10+
end
911

1012
t 's_texts' do
1113
exp = ['UICatalog', 'Buttons, Various uses of UIButton', 'Controls, Various uses of UIControl', 'TextFields, Uses of UITextField', 'SearchBar, Use of UISearchBar', 'TextView, Use of UITextField', 'Pickers, Uses of UIDatePicker, UIPickerView', 'Images, Use of UIImageView', 'Web, Use of UIWebView', 'Segments, Various uses of UISegmentedControl', 'Toolbar, Uses of UIToolbar', 'Alerts, Various uses of UIAlertView, UIActionSheet', 'Transitions, Shows UIViewAnimationTransitions']

ios_tests/lib/ios/specs/ios/element/textfield.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ def after_last
99
set_wait 30
1010
end
1111

12-
t { before_first }
12+
t 'before_first' do
13+
before_first
14+
end
1315

1416
t 'textfields' do
1517
textfields.include?('<enter text>').must_equal true
@@ -111,5 +113,7 @@ def must_raise_no_element &block
111113
must_raise_no_element { textfield_exact('does not exist') }
112114
end
113115

114-
t { after_last }
116+
t 'after_last' do
117+
after_last
118+
end
115119
end

ios_tests/lib/ios/specs/ios/helper.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ def before_first
55
screen.must_equal catalog
66
end
77

8-
t { before_first }
8+
t 'before_first' do
9+
before_first
10+
end
911

1012
t 'find_eles_attr' do
1113
find_eles_attr(:text, :text).length.must_equal 13

ios_tests/lib/ios/specs/ios/patch.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ def after_last
1010
leave_textfields
1111
end
1212

13-
t { before_first }
13+
t 'before_first' do
14+
before_first
15+
end
1416

1517
t 'type' do
1618
# nav to textfield
@@ -21,5 +23,7 @@ def after_last
2123
ele.text.must_equal 'ok'
2224
end
2325

24-
t { after_last }
26+
t 'after_last' do
27+
after_last
28+
end
2529
end

0 commit comments

Comments
 (0)