angular_webdriver 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9045bf7bc4696d2d8830c356179282e792775e
-  data.tar.gz: 4a5b5555d20df4990b6ccef339708341198d9328
+  metadata.gz: 129723933393935ba3f51f00d55c00170701b4c1
+  data.tar.gz: 0f0458f8424f2010c459206d9d2d6ec26800fe71
 SHA512:
-  metadata.gz: f7d0f23c5d5cb72520b763bf17954ee949b5815ca438577da6f074e0289932282e96862e166de84074ebc7166d87d9b676733e0c69fbde93f391fff457e6ed43
-  data.tar.gz: 57dba96745f042756365ccabf2a291d0f6f33cb026acd26f2b94a6a759b687ccdbcd397474b6041fed4468f8311c19152a2de729501e19d3be1054cc55f61375
+  metadata.gz: 8d6e619430ed609bbe8cd6ca53591acd93c02a23413195c129bbb11d9242df64e77ebf159d188eded115110b61a9f3cf86793257731cb8546e7678cedff5366e
+  data.tar.gz: 16233f787ff5ca1603df8668587e455b4aa9941ce08cb5edbe7cd825741e16d84824cef770440af574f71239c9244d89fd1a0b14f21d590ceee8c2e07955714e

data/lib/angular_webdriver/protractor/protractor.rb

@@ -49,7 +49,27 @@ class Protractor
   #
   # @return [String] Default nil.
   #
-  attr_accessor :base_url
+  attr_reader :base_url
+
+  # Sets the base url.
+  #
+  # Expected format:
+  # scheme://host
+  #
+  # Example:
+  # http://localhost
+  #
+  # @param url [String] the url to use as a base
+  #
+  # @return [String] url
+  def base_url= url
+    # Allow resetting base_url with falsey value
+    return @base_url = nil unless url
+
+    uri = URI.parse(url) rescue false
+    raise "Invalid URL #{url.inspect}. Must contain scheme and host." unless uri && uri.scheme && uri.host
+    @base_url = url
+  end
 
   #  All scripts to be run on the client via executeAsyncScript or
   #  executeScript should be put here.
@@ -97,19 +117,31 @@ class Protractor
       raise "Invalid destination #{destination}"
     end
 
-    # URI.join doesn't allow for http://localhost:8081/#/ as a base_url
-    # so this departs from the Protractor behavior and favors File.join instead.
-    #
-    # In protractor: url.resolve('http://localhost:8081/#/', 'async')
-    #                => http://localhost:8081/async
-    # In Ruby:       File.join('http://localhost:8081/#/', 'async')
-    #                => http://localhost:8081/#/async
-    #
-    base_url_exists = base_url && !base_url.empty?
-    no_scheme = !URI.parse(destination).scheme rescue true
-
-    if base_url_exists && no_scheme
-      destination = File.join(base_url, destination.to_s)
+    # http://about:blank doesn't work. it must be exactly about:blank
+    about_url = destination.start_with?('about:')
+
+    # data urls must be preserved and not have http:// prepended.
+    # data:<blah>
+    data_url = destination.start_with?('data:')
+
+    unless about_url || data_url
+      # URI.join doesn't allow for http://localhost:8081/#/ as a base_url
+      # so this departs from the Protractor behavior and favors File.join instead.
+      #
+      # In protractor: url.resolve('http://localhost:8081/#/', 'async')
+      #                => http://localhost:8081/async
+      # In Ruby:       File.join('http://localhost:8081/#/', 'async')
+      #                => http://localhost:8081/#/async
+      #
+      base_url_exists = base_url && !base_url.empty?
+      tmp_uri = URI.parse(destination) rescue URI.parse('')
+      relative_url = !tmp_uri.scheme || !tmp_uri.host
+
+      if base_url_exists && relative_url
+        destination = File.join(base_url, destination.to_s)
+      elsif relative_url # prepend 'http://' to urls such as localhost
+        destination = "http://#{destination}"
+      end
     end
 
     msg = lambda { |str| 'Protractor.get(' + destination + ') - ' + str }

data/lib/angular_webdriver/version.rb

@@ -1,4 +1,4 @@
 module AngularWebdriver
-  VERSION = '1.0.2' unless defined? ::AngularWebdriver::VERSION
+  VERSION = '1.0.3' unless defined? ::AngularWebdriver::VERSION
   DATE    = '2015-06-07' unless defined? ::AngularWebdriver::DATE
 end

data/release_notes.md

@@ -1,3 +1,11 @@
+#### v1.0.3 2015-06-07
+
+- [97d5f18](https://github.com/bootstraponline/angular_webdriver/commit/97d5f18e187d56bc8616fb65ec1e5b9bafa8c289) Release 1.0.3
+- [42b527e](https://github.com/bootstraponline/angular_webdriver/commit/42b527e81045c03b051bf14494189da8276cf754) Fix about and data url handling
+- [8022a5c](https://github.com/bootstraponline/angular_webdriver/commit/8022a5c04e46f0f007d2b9bd394b914127cc610a) Fix set_max_page_wait spec
+- [6000137](https://github.com/bootstraponline/angular_webdriver/commit/60001379d283d289247b8a2f9adad9469a8921bd) Fix loading urls without scheme
+
+
 #### v1.0.2 2015-06-07
 
 - [9b9cc12](https://github.com/bootstraponline/angular_webdriver/commit/9b9cc12e778d4230cd5ea6382bb9e31de4506b0a) Release 1.0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular_webdriver
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - code@bootstraponline.com