Skip to content

Commit f8425e5

Browse files
committed
fix single quote's escape
1 parent b001945 commit f8425e5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ def keyboard_must_exist
7171
t 'textfield type' do
7272
# Regular send keys triggers the keyboard and doesn't dismiss
7373
keyboard_must_not_exist unless UI::Inventory.xcuitest? # xcuitest doesn't support JS command
74-
textfield(1).send_keys 'ok'
74+
textfield(1).send_keys "o'k"
7575
keyboard_must_exist unless UI::Inventory.xcuitest? # xcuitest doesn't support JS command
7676

77+
find_exact("o'k").text.must_equal "o'k"
78+
7779
unless UI::Inventory.xcuitest?
7880
# type should not dismiss the keyboard
7981
message = 'type test type'

lib/appium_lib/ios/helper.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ def ele_index(class_name, index)
229229
def string_attr_exact(class_name, attr, value)
230230
if automation_name_is_xcuitest?
231231
if attr == '*'
232-
%((//#{class_name})[@*[.='#{value}']])
232+
%((//#{class_name})[@*[.="#{value}"]])
233233
else
234-
%((//#{class_name})[@#{attr}='#{value}'])
234+
%((//#{class_name})[@#{attr}="#{value}"])
235235
end
236236
else
237-
%(//#{class_name}[@visible="true" and @#{attr}='#{value}'])
237+
%(//#{class_name}[@visible="true" and @#{attr}="#{value}"])
238238
end
239239
end
240240

@@ -262,12 +262,12 @@ def find_eles_by_attr(class_name, attr, value)
262262
def string_attr_include(class_name, attr, value)
263263
if automation_name_is_xcuitest?
264264
if attr == '*'
265-
%((//#{class_name})[@*[contains(translate(., '#{value.upcase}', '#{value}'), '#{value}')]])
265+
%((//#{class_name})[@*[contains(translate(., "#{value.upcase}", "#{value}"), "#{value}")]])
266266
else
267-
%((//#{class_name})[contains(translate(@#{attr}, '#{value.upcase}', '#{value}'), '#{value}')])
267+
%((//#{class_name})[contains(translate(@#{attr}, "#{value.upcase}", "#{value}"), "#{value}")])
268268
end
269269
else
270-
%(//#{class_name}[@visible="true" and contains(translate(@#{attr},'#{value.upcase}', '#{value}'), '#{value}')])
270+
%(//#{class_name}[@visible="true" and contains(translate(@#{attr},"#{value.upcase}", "#{value}"), "#{value}")])
271271
end
272272
end
273273

0 commit comments

Comments
 (0)