pivotal-selenium-grid 0.2.2 → 0.2.4
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/selenium-grid +22 -1
- data/lib/java/vm.rb +1 -1
- data/lib/selenium-grid/version.rb +1 -1
- data/spec/java/vm_spec.rb +3 -3
- metadata +1 -1
data/bin/selenium-grid
CHANGED
@@ -106,6 +106,19 @@ class RcRunningOptions < SeleniumGridOptions
|
|
106
106
|
end
|
107
107
|
end
|
108
108
|
|
109
|
+
# class GlobalOptions < SeleniumGridOptions
|
110
|
+
#
|
111
|
+
# protected
|
112
|
+
#
|
113
|
+
# def initialize_options
|
114
|
+
# return OptionParser.new do |opts|
|
115
|
+
# opts.banner = "global options"
|
116
|
+
#
|
117
|
+
# opts.on('-v', '--version', 'print the version')
|
118
|
+
# end
|
119
|
+
# end
|
120
|
+
# end
|
121
|
+
|
109
122
|
case ARGV.first
|
110
123
|
when 'grid:list':
|
111
124
|
hub = Hub.instance.list.collect { |port, component| "#{port}\t#{component}"}
|
@@ -134,8 +147,14 @@ case ARGV.first
|
|
134
147
|
puts options[:port] ? Remote.instance.running?(options[:port]) : Remote.instance.running?
|
135
148
|
when 'rc:list':
|
136
149
|
puts Remote.instance.list.collect { |port, browser| "#{port}\tremote\t#{browser}"}.sort.join("\n")
|
150
|
+
when '--version':
|
151
|
+
puts SeleniumGrid::VERSION::STRING
|
152
|
+
when '-v':
|
153
|
+
puts SeleniumGrid::VERSION::STRING
|
137
154
|
else
|
138
|
-
puts "Usage:
|
155
|
+
puts "Usage:"
|
156
|
+
puts "\tselenium-grid <command> [options]"
|
157
|
+
puts "\tselenium-grid -v/--version"
|
139
158
|
puts ""
|
140
159
|
puts "commands"
|
141
160
|
puts "\t" + %w(grid:list grid:stop hub:start hub:stop hub:list hub:running rc:start rc:stop rc:list rc:running).join("\n\t")
|
@@ -145,4 +164,6 @@ case ARGV.first
|
|
145
164
|
RcStartOptions.new.summarize
|
146
165
|
RcStopOptions.new.summarize
|
147
166
|
RcRunningOptions.new.summarize
|
167
|
+
|
168
|
+
puts "Version: #{SeleniumGrid::VERSION::STRING}"
|
148
169
|
end
|
data/lib/java/vm.rb
CHANGED
data/spec/java/vm_spec.rb
CHANGED
@@ -40,8 +40,8 @@ module Java
|
|
40
40
|
end
|
41
41
|
|
42
42
|
it "is the last option" do
|
43
|
-
mock(vm).sh("java test.ClassName
|
44
|
-
vm.run "test.ClassName", {:background => true, :
|
43
|
+
mock(vm).sh("java test.ClassName -one uno &")
|
44
|
+
vm.run "test.ClassName", {:background => true, :arguments => { :one => 'uno' }}
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
@@ -54,7 +54,7 @@ module Java
|
|
54
54
|
|
55
55
|
context "when the options include :log" do
|
56
56
|
before do
|
57
|
-
mock(vm).mkdir_p("/var/log")
|
57
|
+
mock(vm).mkdir_p("/var/log", :verbose => false)
|
58
58
|
end
|
59
59
|
|
60
60
|
it "shells out to java and redirects output to the specified log file" do
|