operawatir 0.4.1.pre5-jruby → 0.4.1.pre6-jruby
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.
- data/AUTHORS +1 -0
- data/CHANGES +170 -3
- data/README.md +30 -27
- data/VERSION +1 -1
- data/bin/desktopwatir +19 -16
- data/bin/operawatir +4 -4
- data/lib/operadriver/client-combined-nodeps.jar +0 -0
- data/lib/operadriver/webdriver-opera.jar +0 -0
- data/lib/operawatir/browser.rb +1 -2
- data/lib/operawatir/collection.rb +1 -1
- data/lib/operawatir/compat/collection.rb +13 -0
- data/lib/operawatir/compat/element.rb +57 -15
- data/lib/operawatir/compat/window.rb +41 -0
- data/lib/operawatir/desktop_browser.rb +26 -9
- data/lib/operawatir/desktop_container.rb +82 -29
- data/lib/operawatir/element.rb +48 -24
- data/lib/operawatir/keys.rb +18 -25
- data/lib/operawatir/preferences.rb +223 -6
- data/lib/operawatir/quickwidgets/quick_button.rb +8 -2
- data/lib/operawatir/quickwidgets/quick_checkbox.rb +4 -4
- data/lib/operawatir/quickwidgets/quick_editfield.rb +1 -1
- data/lib/operawatir/quickwidgets/quick_find.rb +11 -0
- data/lib/operawatir/quickwidgets/quick_griditem.rb +11 -0
- data/lib/operawatir/quickwidgets/quick_gridlayout.rb +11 -0
- data/lib/operawatir/quickwidgets/quick_searchfield.rb +5 -1
- data/lib/operawatir/quickwidgets/quick_tab.rb +0 -1
- data/lib/operawatir/quickwidgets/quick_treeitem.rb +22 -1
- data/lib/operawatir/quickwidgets/quick_widget.rb +61 -22
- data/lib/operawatir/quickwidgets/quick_window.rb +26 -0
- data/lib/operawatir/quickwidgets.rb +2 -1
- data/lib/operawatir/window.rb +36 -25
- data/lib/operawatir.rb +1 -1
- data/operawatir.gemspec +38 -5
- data/spec/operawatir/core/element_spec.rb +5 -0
- data/spec/operawatir/core/window_spec.rb +42 -0
- data/spec/operawatir/desktop/desktopbrowser_spec.rb +16 -0
- data/spec/operawatir/desktop/quickaddressfield_spec.rb +15 -3
- data/spec/operawatir/desktop/quickbutton_spec.rb +234 -20
- data/spec/operawatir/desktop/quickcheckbox_spec.rb +36 -0
- data/spec/operawatir/desktop/quickdialogtab_spec.rb +30 -0
- data/spec/operawatir/desktop/quickdropdown_spec.rb +39 -0
- data/spec/operawatir/desktop/quickeditfield_spec.rb +51 -0
- data/spec/operawatir/desktop/quickfind_spec.rb +30 -0
- data/spec/operawatir/desktop/quickgriditem_spec.rb +16 -0
- data/spec/operawatir/desktop/quickgridlayout_spec.rb +15 -0
- data/spec/operawatir/desktop/quicklabel_spec.rb +28 -0
- data/spec/operawatir/desktop/quickradiobutton_spec.rb +24 -0
- data/spec/operawatir/desktop/quicksearchfield_spec.rb +26 -0
- data/spec/operawatir/desktop/quicktab_spec.rb +86 -0
- data/spec/operawatir/desktop/quickthumbnail_spec.rb +37 -0
- data/spec/operawatir/desktop/quicktreeitem_spec.rb +135 -0
- data/spec/operawatir/desktop/quicktreeview_spec.rb +30 -0
- data/spec/operawatir/desktop/quickwidget_spec.rb +52 -11
- data/spec/operawatir/desktop/quickwindow_spec.rb +11 -0
- data/spec/operawatir/desktop/shared/shared.rb +100 -10
- data/spec/operawatir/fixtures/browsers.svg +367 -0
- data/spec/operawatir/fixtures/frames.html +13 -0
- data/spec/watir2/select_list_spec.rb +84 -71
- metadata +37 -4
- data/lib/operadriver/selenium-common.jar +0 -0
data/AUTHORS
CHANGED
data/CHANGES
CHANGED
@@ -1,3 +1,170 @@
|
|
1
|
+
v0.4.1.pre6 2011-05-09
|
2
|
+
|
3
|
+
[API CHANGES]
|
4
|
+
|
5
|
+
* Added Compat::Collection#select. (andreastt)
|
6
|
+
|
7
|
+
* Added Compat::Collection#selected?. (andreastt)
|
8
|
+
|
9
|
+
* Added Compat::Window#frame. (andreastt)
|
10
|
+
|
11
|
+
* Added Compat::Window#show_frames. (andreastt)
|
12
|
+
|
13
|
+
* Added Compat::Window#switch_to_default. (andreastt)
|
14
|
+
|
15
|
+
* Added DesktopBrowser#string. (karie)
|
16
|
+
|
17
|
+
* Added DesktopContainer#quick_find. (karie)
|
18
|
+
|
19
|
+
* Added DesktopContainer#quick_griditem. (karie)
|
20
|
+
|
21
|
+
* Added DesktopContainer#quick_gridlayout. (karie)
|
22
|
+
|
23
|
+
* Added Element#exist? and alias Element#exists? which will ensure
|
24
|
+
that querying whether elements exists in Watir 2 compatibility
|
25
|
+
mode will work. (andreastt)
|
26
|
+
|
27
|
+
* New classes QuickFind, QuickGridItem and QuickGridLayout. (karie)
|
28
|
+
|
29
|
+
* Added QuickTreeItem#collapse_with_click. (karie)
|
30
|
+
|
31
|
+
* Added QuickTreeItem#load_window_with_double_click. (karie)
|
32
|
+
|
33
|
+
* Added QuickWidget#has_ui_string?. (karie)
|
34
|
+
|
35
|
+
* Added QuickWidget#height. (karie)
|
36
|
+
|
37
|
+
* Added QuickWidget#width. (karie)
|
38
|
+
|
39
|
+
* Added QuickWidget#x. (karie)
|
40
|
+
|
41
|
+
* Added QuickWidget#y. (karie)
|
42
|
+
|
43
|
+
* Added QuickWindow#height. (karie)
|
44
|
+
|
45
|
+
* Added QuickWindow#width. (karie)
|
46
|
+
|
47
|
+
* Added QuickWindow#x. (karie)
|
48
|
+
|
49
|
+
* Added QuickWindow#y. (karie)
|
50
|
+
|
51
|
+
* Removed Collection#to_s. (karie)
|
52
|
+
|
53
|
+
* Removed Element#to_s. (karie)
|
54
|
+
|
55
|
+
* Removed QuickWidget#is_text?. (karie)
|
56
|
+
|
57
|
+
* Deprecated QuickWidgets#verify_includes_text, making #verify_text
|
58
|
+
handle text substitution. Fixes DSK-329541 and DSK-330462.
|
59
|
+
(karie)
|
60
|
+
|
61
|
+
[NEW FEATURES]
|
62
|
+
|
63
|
+
* Added --opera-idle command line option to desktopwatir binary.
|
64
|
+
(karie)
|
65
|
+
|
66
|
+
* Added --manual command line option to desktopwatir binary.
|
67
|
+
(karie)
|
68
|
+
|
69
|
+
[ENHANCEMENTS]
|
70
|
+
|
71
|
+
* Upgraded OperaDriver to v0.4.2.pre7-g4db1c56-internal.
|
72
|
+
(andreastt)
|
73
|
+
|
74
|
+
* Enabling full backtrace (from RSpec) again.
|
75
|
+
|
76
|
+
* OperaDriver.getText() has been removed, replaced by doing
|
77
|
+
Window#document.getText() instead. #document calls root element
|
78
|
+
using CSS selectors. Fixes WTR-338. (andreastt)
|
79
|
+
|
80
|
+
* Cleaned up some code in Element by simplifying if-blocks.
|
81
|
+
(andreastt)
|
82
|
+
|
83
|
+
* OperaWatir Desktop specification suite has been completed.
|
84
|
+
(karie, mariap)
|
85
|
+
|
86
|
+
* Updated Mac launcher which now includes the emo patch.
|
87
|
+
(andreastt)
|
88
|
+
|
89
|
+
[BUG FIXES]
|
90
|
+
|
91
|
+
* Idle is now disabled by default in OperaDriver, adding
|
92
|
+
environmental check and enabling --opera-idle switch properly.
|
93
|
+
(andreastt)
|
94
|
+
|
95
|
+
* Added support for accessing method select_list(s) from Watir 2.
|
96
|
+
(andreastt)
|
97
|
+
|
98
|
+
* Releasing all parts of an array when modifiers are pressed as
|
99
|
+
second argument. Fixes WTR-339. (andreastt)
|
100
|
+
|
101
|
+
* QuickSearchField#search_with_index retuns text in search field,
|
102
|
+
not address bar. Fixes DSK-328699. (karie)
|
103
|
+
|
104
|
+
* Fix in bin/desktopwatir for calling binary with full path to Watir
|
105
|
+
script. Fixes DSK-330007. (karie)
|
106
|
+
|
107
|
+
* Now using RSpec's :file_or_directories_to_run option instead of
|
108
|
+
:files_to_run, which has been deprecated. (andreastt)
|
109
|
+
|
110
|
+
* #text= is called by compatibility code, but didn't have a check
|
111
|
+
for whether element was an INPUT @type="checkbox". we are now
|
112
|
+
toggling check instead of attempting to send keys. (andreastt)
|
113
|
+
|
114
|
+
* Helper executes RSpec autorun programmatically, disabling this by
|
115
|
+
moving it to the end of the file if any of the above abort
|
116
|
+
statements in bin/operawatir is called. (andreastt)
|
117
|
+
|
118
|
+
* Attempted to do #uncheck! on textareas or input elements, fixed by
|
119
|
+
calling WebDriver's clear() method instead. Fixes WTR-331.
|
120
|
+
(andreastt)
|
121
|
+
|
122
|
+
* Removed workaround for option --opera-idle. This has now properly
|
123
|
+
been implemented in OperaDriver, and we are as such doing the
|
124
|
+
right thing now. (andreastt)
|
125
|
+
|
126
|
+
* QuickWidgets#toggle_with_click failed if clicking removed the
|
127
|
+
element clicked. Fixes DSK-330329. (karie)
|
128
|
+
|
129
|
+
* Now handling ampersands in strings got from string_ids. Fixes
|
130
|
+
DSK-319071. (karie)
|
131
|
+
|
132
|
+
* Construction of buttons by position is now possible. (karie)
|
133
|
+
|
134
|
+
* Add type checking to retrieval algorithm for widgets. Fixes
|
135
|
+
DSK-320616. (karie)
|
136
|
+
|
137
|
+
* Never raise UnknownObjectException on lookup, user must be able to
|
138
|
+
execute methods like Collection#exist? on empty collection
|
139
|
+
according to Watir specification. (andreastt)
|
140
|
+
|
141
|
+
* #full_backtrace= is broken in RSpec, but andreastt has patched it
|
142
|
+
in upstream. Added temporary workaround for it in
|
143
|
+
bin/operawatir.
|
144
|
+
|
145
|
+
* Element#value no longer does check for INPUT, TEXTAREA or SELECT
|
146
|
+
fields in Watir, but leaves this to OperaDriver. (andreastt)
|
147
|
+
|
148
|
+
[OTHER]
|
149
|
+
|
150
|
+
* Added documentation for the Preferences implementation.
|
151
|
+
(andreastt)
|
152
|
+
|
153
|
+
* Added documentation for more desktop code. (karie)
|
154
|
+
|
155
|
+
* Added #visual_hash tests for SVG documents. (andreastt)
|
156
|
+
|
157
|
+
* Upgraded select_list_spec.rb to latest HEAD from jarib:watirspec.
|
158
|
+
(andreastt)
|
159
|
+
|
160
|
+
v0.4.1.pre5 2011-03-18
|
161
|
+
|
162
|
+
[BUG FIXES]
|
163
|
+
|
164
|
+
* Upgraded to OperaDriver v0.4.2.pre5-15-gf8e8949 containing an
|
165
|
+
updated 64-bit launcher that will work on older versions of libc.
|
166
|
+
(andreastt)
|
167
|
+
|
1
168
|
v0.4.1.pre4 2011-03-17
|
2
169
|
|
3
170
|
[NEW FEATURES]
|
@@ -5,16 +172,16 @@ v0.4.1.pre4 2011-03-17
|
|
5
172
|
* Imlemented temporary environmental variable for switching OperaIdle
|
6
173
|
on and off for SPARTAN. This will override the --opera-idle option.
|
7
174
|
Set the OPERA_IDLE environmental variable to a truthy variable
|
8
|
-
(true, "true", 1, "1") to enable.
|
175
|
+
(true, "true", 1, "1") to enable. (andreastt)
|
9
176
|
|
10
177
|
[BUG FIXES]
|
11
178
|
|
12
179
|
* Temporarily passing OPERA_ARGS environmental variable to OperaDriver
|
13
180
|
to enable fullscreen testing on SPARTAN. OPERA_ARGS will in the
|
14
|
-
future be detected in OperaDriver.
|
181
|
+
future be detected in OperaDriver. (andreastt)
|
15
182
|
|
16
183
|
* /lib/operawatir/helper.rb will now autorun RSpec, fixing the
|
17
|
-
all-tests-failing issue on SPARTAN.
|
184
|
+
all-tests-failing issue on SPARTAN. (andreastt)
|
18
185
|
|
19
186
|
v0.4.1.pre3 2011-03-14
|
20
187
|
|
data/README.md
CHANGED
@@ -13,7 +13,7 @@
|
|
13
13
|
|
14
14
|
### Requirements
|
15
15
|
|
16
|
-
OperaWatir runs on GNU/Linux, Mac OS X and Windows operating systems. Required dependencies are _Java_ >= 1.6.0, _JRuby_ <= 1.5.5, _RubyGems_ >= 1.3.5, _RSpec_
|
16
|
+
OperaWatir runs on GNU/Linux, Mac OS X and Windows operating systems. Required dependencies are _Java_ >= 1.6.0, _JRuby_ <= 1.5.5, _RubyGems_ >= 1.3.5, _RSpec_ >= 2.4, and a somewhat recent build of Opera (desktop, internal, mobile). For Windows you must also have the Microsoft Visual C++ 2008 Redistributable Package.
|
17
17
|
|
18
18
|
### Installation procedure
|
19
19
|
|
@@ -37,8 +37,8 @@ Let's take a closer look at how this works.
|
|
37
37
|
browser = OperaWatir::Browser.new
|
38
38
|
|
39
39
|
browser.goto 'http://en.wikipedia.org/'
|
40
|
-
browser.text_field(:id
|
41
|
-
browser.button(:id
|
40
|
+
browser.text_field(:id, 'searchInput').set 'Opera'
|
41
|
+
browser.button(:id, 'searchButton').click
|
42
42
|
|
43
43
|
The script above will tell the browser to load the front page of Wikipedia, write “Opera” in the search field and click the search button. If all goes as intended, the browser will end up at a relevant article.
|
44
44
|
|
@@ -54,10 +54,9 @@ As Watir scripts are run in a full-featured browser, all keypresses and clicks w
|
|
54
54
|
browser = OperaWatir::Browser.new
|
55
55
|
|
56
56
|
browser.goto 'http://en.wikipedia.org/'
|
57
|
-
browser.text_field(:id
|
57
|
+
browser.text_field(:id, 'searchInput').click
|
58
58
|
browser.type 'Hello world'
|
59
|
-
browser.
|
60
|
-
browser.key 'Enter'
|
59
|
+
browser.keys.send :down, :enter
|
61
60
|
|
62
61
|
The first suggested link will be selected by pressing arrow down (``'Down'``) and navigated to (``'Enter'``). Using the same key events, you could even teach a script to play platform games:
|
63
62
|
|
@@ -66,12 +65,12 @@ The first suggested link will be selected by pressing arrow down (``'Down'``) an
|
|
66
65
|
|
67
66
|
browser.goto 'http://www.phoboslab.org/biolab/'
|
68
67
|
sleep 2
|
69
|
-
browser.
|
68
|
+
browser.keys.send 'X'
|
70
69
|
sleep 1
|
71
|
-
browser.
|
72
|
-
5.times { browser.
|
73
|
-
2.times { browser.
|
74
|
-
browser.
|
70
|
+
browser.keys.down :right
|
71
|
+
5.times { browser.keys.send 'X' }
|
72
|
+
2.times { browser.keys.send 'C' }
|
73
|
+
browser.keys.up :right
|
75
74
|
|
76
75
|
Sending commands to the browser is great, but sometimes we want to get something back too. The following lines of code will have the browser automatically look up the phone number of Opera Software in the [yellow pages](http://gulesider.no/) and write it to the console.
|
77
76
|
|
@@ -81,9 +80,9 @@ Sending commands to the browser is great, but sometimes we want to get something
|
|
81
80
|
browser = OperaWatir::Browser.new
|
82
81
|
|
83
82
|
browser.goto 'http://gulesider.no/'
|
84
|
-
browser.text_field(:name
|
85
|
-
browser.button(:name
|
86
|
-
puts browser.li(:class
|
83
|
+
browser.text_field(:name, 'search_word').set 'Opera Software'
|
84
|
+
browser.button(:name, 'btn_cs').click
|
85
|
+
puts browser.li(:class, 'tel').text
|
87
86
|
|
88
87
|
When running proper functional tests on your web application with Watir, you might want a bit more structured output. To define assertions and get pretty test reports, you can use [RSpec](http://rspec.info/), a behaviour-driven testing framework.
|
89
88
|
|
@@ -95,15 +94,15 @@ When writing test suites you can use the OperaWatir::Helper class to help ease s
|
|
95
94
|
end
|
96
95
|
|
97
96
|
it 'finds the phone number to Opera Software' do
|
98
|
-
browser.text_field(:name
|
99
|
-
browser.button(:name
|
97
|
+
browser.text_field(:name, 'search_word').set 'Opera Software'
|
98
|
+
browser.button(:name, 'btn_cs').click
|
100
99
|
browser.li(:class => 'tel').text.should == '24 16 40 00'
|
101
100
|
end
|
102
101
|
|
103
102
|
it 'finds the phone number to the Norwegian Opera and Ballet' do
|
104
|
-
browser.text_field(:name
|
105
|
-
browser.button(:name
|
106
|
-
browser.li(:class
|
103
|
+
browser.text_field(:name, 'search_word').set 'Den Norske Opera'
|
104
|
+
browser.button(:name, 'btn_cs').click
|
105
|
+
browser.li(:class, 'tel').text.should == '21 42 21 00'
|
107
106
|
end
|
108
107
|
end
|
109
108
|
|
@@ -122,29 +121,34 @@ If anything fails, more information about each failure will be provided.
|
|
122
121
|
|
123
122
|
You can also see ``operawatir -h`` for more usage information:
|
124
123
|
|
125
|
-
Usage: operawatir [-m|--manual] [-l|--launcher=BINARY] [
|
126
|
-
[-a|--args=ARGUMENTS] [-q|--no-quit] [--
|
127
|
-
[-
|
124
|
+
Usage: operawatir [-m|--manual] [-l|--launcher=BINARY] [--binary=BINARY]
|
125
|
+
[-a|--args=ARGUMENTS] [-q|--no-quit] [--opera-idle] [-b|--backtrace]
|
126
|
+
[--no-color] [-t|--tag=TAG] [-f|--format=FORMAT] [-o|--out=FILE]
|
127
|
+
[-h|--help] [-v|--version] FILES
|
128
128
|
|
129
129
|
Specific options:
|
130
130
|
-m, --manual Wait for a manual connection from opera:debug
|
131
131
|
-l, --launcher=BINARY Path to launcher binary, will use environmental
|
132
132
|
variable OPERA_LAUNCHER if not specified
|
133
|
-
|
133
|
+
--binary=BINARY Browser to run the test with, will use guess the
|
134
134
|
path or use environmental variable OPERA_PATH if
|
135
135
|
not specified
|
136
136
|
-a, --args=ARGUMENTS Arguments passed to the binary, will override
|
137
137
|
environmental variable OPERA_ARGS
|
138
138
|
-q, --no-quit Disable quitting of Opera at the end of a test run
|
139
|
-
--
|
139
|
+
--opera-idle Enable OperaIdle
|
140
|
+
-b, --backtrace Enable full backtrace
|
140
141
|
--no-color Disable colorized output
|
142
|
+
-t, --tag=TAG Specify tags to only run examples with the specified
|
143
|
+
tag, to exclude examples, add ~ before the tag (e.g.
|
144
|
+
`~slow')
|
141
145
|
-o, --out=FILE Send output to a file instead of STDOUT
|
142
146
|
-f, --format=FORMAT Specify RSpec output formatter (documentation,
|
143
147
|
html, progress (default), textmate)
|
144
148
|
|
145
149
|
Common options:
|
146
150
|
-h, --help Show this message
|
147
|
-
|
151
|
+
-v, --version Show version
|
148
152
|
|
149
153
|
## Third-Party Libraries
|
150
154
|
|
@@ -161,5 +165,4 @@ OperaWatir uses the following libraries:
|
|
161
165
|
- [bluecloth](http://deveiate.org/projects/BlueCloth) (BSD License)
|
162
166
|
- [clipboard](https://github.com/janlelis/clipboard) (MIT License)
|
163
167
|
- [deprecated](https://github.com/erikh/deprecated) (BSD License)
|
164
|
-
- [bundler](http://gembundler.com/) (MIT License)
|
165
|
-
|
168
|
+
- [bundler](http://gembundler.com/) (MIT License)
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.4.1.
|
1
|
+
0.4.1.pre6
|
data/bin/desktopwatir
CHANGED
@@ -4,9 +4,10 @@ require 'optparse'
|
|
4
4
|
require 'rspec'
|
5
5
|
require 'rbconfig'
|
6
6
|
require 'operawatir'
|
7
|
-
|
7
|
+
|
8
8
|
|
9
9
|
@options = {
|
10
|
+
#:manual => false,
|
10
11
|
:ng => false,
|
11
12
|
:color_enabled => true,
|
12
13
|
:check_syntax => false,
|
@@ -15,7 +16,7 @@ require 'operawatir/desktop_helper'
|
|
15
16
|
:no_quit => false,
|
16
17
|
:no_restart => false,
|
17
18
|
:opera_idle => false,
|
18
|
-
|
19
|
+
#:full_backtrace => false # TODO: Provide fix for RSpec
|
19
20
|
}
|
20
21
|
|
21
22
|
# TODO
|
@@ -24,6 +25,7 @@ require 'operawatir/desktop_helper'
|
|
24
25
|
begin
|
25
26
|
OptionParser.new do |opts|
|
26
27
|
opts.banner = <<EOS
|
28
|
+
|
27
29
|
Usage: desktopwatir [-l|--launcher=BINARY] [-e|--executable=BINARY]
|
28
30
|
[-a|--args=ARGUMENTS] [--no-color] [-q|--no-quit] [-r|--no-restart]
|
29
31
|
[--opera-idle] [-b|--backtrace] [-t|--tag=TAG] [-f|--format=FORMAT]
|
@@ -33,6 +35,11 @@ EOS
|
|
33
35
|
opts.separator ''
|
34
36
|
opts.separator 'Specific options:'
|
35
37
|
|
38
|
+
#run without launcher and with manual connection, restart not possible (same as -rq)
|
39
|
+
#opts.on('-m', '--manual', 'Wait for a manual connection from opera:debug') do |c|
|
40
|
+
# @options[:manual] = c
|
41
|
+
#end
|
42
|
+
|
36
43
|
opts.on('-l', '--launcher=BINARY', 'Path to launcher binary, will use environmental ',
|
37
44
|
'variable OPERA_LAUNCHER if not specified') do |c|
|
38
45
|
@options[:launcher] = c
|
@@ -51,7 +58,7 @@ EOS
|
|
51
58
|
opts.on('--no-color', 'Disable colorized output') do |c|
|
52
59
|
@options[:color_enabled] = false
|
53
60
|
end
|
54
|
-
|
61
|
+
|
55
62
|
opts.on('-q', '--no-quit', 'Disable quitting of Opera at the end of a testrun') do |c|
|
56
63
|
@options[:no_quit] = true
|
57
64
|
end
|
@@ -68,15 +75,6 @@ EOS
|
|
68
75
|
@options[:full_backtrace] = true
|
69
76
|
end
|
70
77
|
|
71
|
-
#opts.on('-c', '--check-syntax', 'Check syntax only') do |c|
|
72
|
-
# @options[:check_syntax] = true
|
73
|
-
#end
|
74
|
-
|
75
|
-
#opts.on('--ng', 'Connect to Nailgun server instead of starting out ',
|
76
|
-
# 'own JVM') do |ng|
|
77
|
-
# @options[:ng] = ng
|
78
|
-
#end
|
79
|
-
|
80
78
|
opts.on('-o', '--out=FILE', 'Send output to a file instead of STDOUT') do |o|
|
81
79
|
@options[:output_stream] = File.open(o, 'w') or
|
82
80
|
abort "desktopwatir: Unable to write to file `#{o}'"
|
@@ -113,10 +111,15 @@ end
|
|
113
111
|
if ARGV.empty?
|
114
112
|
abort 'desktopwatir: You need to specify at least one test file to run'
|
115
113
|
else
|
116
|
-
@options[:
|
117
|
-
@options[:
|
114
|
+
@options[:files_or_directories_to_run] = ARGV
|
115
|
+
@options[:files_or_directories_to_run].map! do | f |
|
116
|
+
if f.include? "\\"
|
117
|
+
f
|
118
|
+
else
|
119
|
+
Dir.glob(f)
|
120
|
+
end
|
121
|
+
end.flatten!
|
118
122
|
end
|
119
123
|
|
120
|
-
|
121
|
-
|
124
|
+
require 'operawatir/desktop_helper'
|
122
125
|
OperaWatir::DesktopHelper.run! @options
|
data/bin/operawatir
CHANGED
@@ -5,7 +5,6 @@ require 'stringio'
|
|
5
5
|
require 'rspec'
|
6
6
|
require 'rbconfig'
|
7
7
|
require 'operawatir'
|
8
|
-
require 'operawatir/helper'
|
9
8
|
|
10
9
|
@options = {
|
11
10
|
:manual => false,
|
@@ -31,8 +30,8 @@ Usage: operawatir [-m|--manual] [-l|--launcher=BINARY] [--binary=BINARY]
|
|
31
30
|
[-h|--help] [-v|--version] FILES
|
32
31
|
EOS
|
33
32
|
|
34
|
-
opts.separator
|
35
|
-
opts.separator
|
33
|
+
opts.separator ''
|
34
|
+
opts.separator 'Specific options:'
|
36
35
|
|
37
36
|
opts.on('-m', '--manual', 'Wait for a manual connection from opera:debug') do |c|
|
38
37
|
@options[:manual] = c
|
@@ -106,7 +105,8 @@ end
|
|
106
105
|
if ARGV.empty?
|
107
106
|
abort 'operawatir: You need to specify at least one test file to run'
|
108
107
|
else
|
109
|
-
@options[:
|
108
|
+
@options[:files_or_directories_to_run] = ARGV
|
110
109
|
end
|
111
110
|
|
111
|
+
require 'operawatir/helper'
|
112
112
|
OperaWatir::Helper.run! @options
|
Binary file
|
Binary file
|