gless 1.3.1 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
data/README.md CHANGED
@@ -240,3 +240,9 @@ markup. Various things you can do:
240
240
  * `yard server`
241
241
  + pretty web interface to the documentation
242
242
 
243
+ ## Note To Self ##
244
+
245
+ To release a new version:
246
+
247
+ * `rake build`
248
+ * `gem push [file]`
@@ -4,8 +4,13 @@
4
4
  :url: https://github.com
5
5
  :browser:
6
6
  :type: remote # Local or remote
7
- :browser: chrome # Which browser to use
8
- :port: 4444 # If remote, port to connect to the selenimu server, otherwise ignored
7
+ :browser: chrome # Which browser to use; "ie", "chrome", and "firefox" are definitely valid, there may be others
8
+ :port: 4444 # If remote, port to connect to the selenium server, otherwise ignored
9
+ # These options would normally only be used with something like
10
+ # SauceLabs
11
+ # :url: "http://rlpowell:[snip]@ondemand.saucelabs.com:80/wd/hub" # The URL Sauce gives you
12
+ # :version: 27 # The browser version to use
13
+ # :platform: 'Windows 7' # The OS to use
9
14
  :verbose: false # Whether to engage in more verbose/info level logging
10
15
  :debug: false # Whether to engage in debug logging
11
16
  :screenshots: false # Whether, if debugging is on, to create screenshots as part of the replay log
data/lib/gless/browser.rb CHANGED
@@ -22,12 +22,34 @@ module Gless
22
22
  type=@config.get :global, :browser, :type
23
23
  browser=@config.get :global, :browser, :browser
24
24
  port=@config.get :global, :browser, :port
25
+ url=@config.get_default false, :global, :browser, :url
26
+ browser_version=@config.get_default '', :global, :browser, :version
27
+ platform=@config.get_default :any, :global, :browser, :platform
28
+
29
+ if browser =~ %r{^\s*ie\s*$} or browser =~ %r{^\s*internet\s*_?\s*explorer\s*$}
30
+ browser = 'internet explorer'
31
+ end
32
+
25
33
  @logger.debug "Launching some browser; #{type}, #{port}, #{browser}"
26
34
 
27
35
  if type == 'remote'
28
36
  @logger.info "Launching remote browser #{browser} on port #{port}"
29
- capabilities = Selenium::WebDriver::Remote::Capabilities.new( :browser_name => browser, :javascript_enabled=>true, :css_selectors_enabled=>true, :takes_screenshot=>true, :native_events=>true )
30
- @browser = Watir::Browser.new(:remote, :url => "http://127.0.0.1:#{port}/wd/hub", :desired_capabilities => capabilities)
37
+ capabilities = Selenium::WebDriver::Remote::Capabilities.new(
38
+ :browser_name => browser,
39
+ :javascript_enabled=>true,
40
+ :css_selectors_enabled=>true,
41
+ :takes_screenshot=>true,
42
+ :version => browser_version,
43
+ :platform => platform
44
+ )
45
+
46
+ if url
47
+ @logger.debug "Launching with custom url #{url}"
48
+ else
49
+ url = "http://127.0.0.1:#{port}/wd/hub"
50
+ end
51
+
52
+ @browser = Watir::Browser.new(:remote, :url => url, :desired_capabilities => capabilities)
31
53
  else
32
54
  @logger.info "Launching local browser #{browser}"
33
55
  @browser = Watir::Browser.new browser
data/lib/gless.rb CHANGED
@@ -6,7 +6,7 @@
6
6
  # project.
7
7
  module Gless
8
8
  # The current version number.
9
- VERSION = '1.3.1'
9
+ VERSION = '1.4.0'
10
10
 
11
11
  # Sets up the config, logger and browser instances, the ordering
12
12
  # of which is slightly tricky. If a block is given, the config, after being
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gless
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.4.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-08-21 00:00:00.000000000 Z
12
+ date: 2013-09-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec