RubyGems - webkit_remote - Versions diffs - 0.3.0 → 0.3.1 - Mend

webkit_remote 0.3.0 → 0.3.1

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.

Files changed (13) hide show

data/Gemfile.lock +2 -2
data/VERSION +1 -1
data/lib/webkit_remote/client/network_events.rb +2 -0
data/lib/webkit_remote/event.rb +2 -0
data/test/fixtures/config.ru +1 -1
data/test/fixtures/html/network.html +1 -1
data/test/fixtures/js/network.js +11 -0
data/test/fixtures/png/network.png +0 -0
data/test/helper.rb +7 -2
data/test/webkit_remote/client/network_test.rb +66 -30
data/test/webkit_remote/event_test.rb +8 -0
data/webkit_remote.gemspec +3 -1
metadata +4 -2

data/Gemfile.lock CHANGED Viewed

@@ -11,8 +11,8 @@ GEM
       rake
       rdoc
     json (1.7.5)
-    minitest (4.1.0)
-    multi_json (1.3.6)
+    minitest (4.2.0)
+    multi_json (1.3.7)
     posix-spawn (0.3.6)
     puma (1.6.3)
       rack (~> 1.2)

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.3.0
1	+ 0.3.1

data/lib/webkit_remote/client/network_events.rb CHANGED Viewed

@@ -182,6 +182,7 @@ class NetworkRequest < WebkitRemote::Event
   # @private Use Event#for instead of calling this constructor directly.
   def initialize(rpc_event, client)
     super
+    @document_url = raw_data['documentURL']
     if raw_data['initiator']
       @initiator = WebkitRemote::Client::NetworkRequestInitiator.new(
           raw_data['initiator'])
@@ -204,6 +205,7 @@ class NetworkRequest < WebkitRemote::Event
     @timestamp = raw_data['timestamp']
     @resource = client.network_resource raw_data['requestId']
+    @resource.set_document_url @document_url
     @resource.set_initiator @initiator
     @resource.set_request @request
     # TODO(pwnall): consider tracking redirects

data/lib/webkit_remote/event.rb CHANGED Viewed

@@ -56,6 +56,8 @@ class Event
         value.can_reach?(client)
       when :name
         class_for(value).can_reach?(client)
+      else
+        true
       end
     end
   end

data/test/fixtures/config.ru CHANGED Viewed

@@ -13,7 +13,7 @@ use Rack::ResponseHeaders do |headers|
 end
 # Cache headers for Network domain testing.
-use Rack::StaticCache, urls: ['/html'], root: 'test/fixtures',
+use Rack::StaticCache, urls: ['/html', '/js', '/png'], root: 'test/fixtures',
                        versioning: false
 app = lambda do |env|
   [

data/test/fixtures/html/network.html CHANGED Viewed

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>WebkitRemote Network test</title>
-    <script type="text/javascript" src="../network.js"></script>
+    <script type="text/javascript" src="../js/network.js"></script>
   </head>
   <body>
     <p>Network test loaded</p>

data/test/fixtures/js/network.js ADDED Viewed

@@ -0,0 +1,11 @@
+(function () {
+  var xhr = new XMLHttpRequest();
+  xhr.responseType = "blob";
+  xhr.onreadystatechange = function () {
+    if (xhr.readyState === 4) {
+      console.log("Test done");
+    }
+  };
+  xhr.open("GET", "../png/network.png", true);
+  xhr.send();
+})();

data/test/fixtures/png/network.png ADDED Viewed

Binary file

data/test/helper.rb CHANGED Viewed

@@ -17,6 +17,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'webkit_remote'
+require 'pp'
 require 'thread'
 Thread.abort_on_exception = true
@@ -36,8 +37,12 @@ end
 class MiniTest::Unit::TestCase
   # URL for a file in the test/fixtures directory.
-  def fixture_url(name)
-    "http://localhost:9969/html/#{name}.html"
+  def fixture_url(name, type = :html)
+    "http://localhost:9969/#{type}/#{name}.#{type}"
+  end
+  # Path to a file in the test/fixtures directory.
+  def fixture_path(name, type = :html)
+    File.join File.dirname(__FILE__), "fixtures/#{type}/#{name}.#{type}"
   end
 end

data/test/webkit_remote/client/network_test.rb CHANGED Viewed

@@ -3,7 +3,8 @@ require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 describe WebkitRemote::Client::Network do
   before :all do
     @client = WebkitRemote.local port: 9669
-    @client.page_events = true
+    @client.console_events = true
+    @client.disable_cache = true
   end
   after :all do
     @client.close
@@ -11,10 +12,9 @@ describe WebkitRemote::Client::Network do
   describe 'without network events enabled' do
     before :all do
-      @client.disable_cache = true
       @client.network_events = false
-      @client.navigate_to fixture_url(:console)
-      @events = @client.wait_for type: WebkitRemote::Event::PageLoaded
+      @client.navigate_to fixture_url(:network)
+      @events = @client.wait_for type: WebkitRemote::Event::ConsoleMessage
     end
     it 'does not receive any network event' do
@@ -37,14 +37,20 @@ describe WebkitRemote::Client::Network do
     before :all do
       @client.disable_cache = true
       @client.network_events = true
-      @client.navigate_to fixture_url(:console)
-      @events = @client.wait_for type: WebkitRemote::Event::PageLoaded
+      @client.navigate_to fixture_url(:network)
+      @events = @client.wait_for type: WebkitRemote::Event::ConsoleMessage
       @requests = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkRequest
       end
       @responses = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkResponse
       end
+      @loads = @events.select do |event|
+        event.kind_of? WebkitRemote::Event::NetworkLoad
+      end
+      @chunks = @events.select do |event|
+        event.kind_of? WebkitRemote::Event::NetworkData
+      end
       @resources = @client.network_resources
     end
@@ -54,24 +60,29 @@ describe WebkitRemote::Client::Network do
     it 'parses initial requests inside NetworkRequest events correctly' do
       @requests[0].request.must_be_kind_of WebkitRemote::Client::NetworkRequest
-      @requests[0].request.url.must_equal fixture_url(:console)
+      @requests[0].request.url.must_equal fixture_url(:network)
       @requests[0].request.method.must_equal :get
       @requests[0].request.headers.must_include 'User-Agent'
       @requests[0].request.headers['User-Agent'].must_match(/webkit/i)
-      @requests[0].request.initiator.type.must_equal :other
-      @requests[0].request.initiator.stack_trace.must_equal nil
+      @requests[0].initiator.type.must_equal :other
+      @requests[0].initiator.stack_trace.must_equal nil
     end
     it 'parses derived requests inside NetworkRequest events correctly' do
-      @requests[1].document_url.must_equal
+      @requests[1].document_url.must_equal fixture_url(:network)
       @requests[1].request.must_be_kind_of WebkitRemote::Client::NetworkRequest
-      @requests[1].request.url.must_equal fixture_url(:console)
-      @requests[0].request.method.must_equal :get
-      @requests[0].request.headers.must_include 'User-Agent'
-      @requests[0].request.headers['User-Agent'].must_match(/webkit/i)
-      @requests[0].request.initiator.type.must_equal :other
-      @requests[0].request.initiator.stack_trace.must_equal nil
+      @requests[1].request.url.must_equal fixture_url(:network, :js)
+      @requests[1].initiator.type.must_equal :parser
+      @requests[1].initiator.stack_trace.must_equal nil
+      @requests[2].document_url.must_equal fixture_url(:network)
+      @requests[2].request.must_be_kind_of WebkitRemote::Client::NetworkRequest
+      @requests[2].request.url.must_equal fixture_url(:network, :png)
+      @requests[2].initiator.type.must_equal :script
+      @requests[2].initiator.stack_trace.must_equal [
+        {column: 7, line: 10, function: "", url: fixture_url(:network, :js)},
+        {column: 3, line: 11, function: "", url: fixture_url(:network, :js)},
+      ]
     end
     it 'receives NetworkResponse events' do
@@ -88,16 +99,11 @@ describe WebkitRemote::Client::Network do
       @requests[0].timestamp.must_be :<, @responses[0].timestamp
     end
-    it 'parses derived NetworkRequest and NetworkResponse events correctly' do
-      @responses[1].type.must_equal :script
-      @responses[2].type.must_equal :image
-    end
-    it 'parses the response inside NetworkResponse events correctly' do
+    it 'parses the initial response inside NetworkResponse events correctly' do
       @responses[0].type.must_equal :document
       @responses[0].response.
                    must_be_kind_of WebkitRemote::Client::NetworkResponse
-      @responses[0].response.url.must_equal fixture_url(:console)
+      @responses[0].response.url.must_equal fixture_url(:network)
       @responses[0].response.status.must_equal 200
       @responses[0].response.status_text.must_equal 'OK'
       @responses[0].response.headers.must_include 'X-Unit-Test'
@@ -110,14 +116,44 @@ describe WebkitRemote::Client::Network do
       @responses[0].response.connection_reused.must_equal false
     end
-    it 'collects request and response data in a NetworkResource' do
-      @resources.wont_be :empty?
+    it 'parses derived responses inside NetworkResponse events correctly' do
+      @responses[1].type.must_equal :script
+      @responses[2].type.must_equal :xhr
+    end
+    it 'receives NetworkData events' do
+      @chunks.wont_be :empty?
+    end
+    it 'parses NetworkData events correctly' do
+      @chunks[0].resource.must_equal @chunks[0].resource
+      @chunks[0].data_length.
+                 must_equal File.read(fixture_path(:network)).length
+      @chunks[0].bytes_received.must_be :>, 0
+    end
+    it 'receives NetworkLoad events' do
+      @loads.wont_be :empty?
+    end
+    it 'parses NetworkLoad events correctly' do
+      @loads[0].resource.must_equal @requests[0].resource
+      @loads[1].resource.must_equal @requests[1].resource
+    end
+    it 'collects request and response data in NetworkResources' do
+      @resources[1].must_equal @requests[1].resource
+      @resources[1].request.must_equal @requests[1].request
+      @resources[1].response.must_equal @responses[1].response
+      @resources[1].type.must_equal :script
+      @resources[1].document_url.must_equal fixture_url(:network)
+      @resources[1].initiator.must_equal @requests[1].initiator
+      @resources[1].canceled.must_equal false
+      @resources[1].error.must_equal nil
+      @resources[1].last_event.must_equal @loads[1]
+      @resources[1].client.must_equal @client
-      @resources[0].request.must_equal @requests[0].request
-      @resources[0].initiator.must_equal @requests[0].initiator
-      @resources[0].response.must_equal @responses[0].response
-      @resources[0].type.must_equal :document
-      @resources[0].client.must_equal @client
+      @resources[-1].last_event.must_equal @chunks[-1]
     end
   end
 end

data/test/webkit_remote/event_test.rb CHANGED Viewed

@@ -63,6 +63,10 @@ describe WebkitRemote::Event do
         WebkitRemote::Event.can_receive?(@client, name: 'Page.loadEventFired').
                             must_equal false
       end
+      it 'should ignore extra properties' do
+        WebkitRemote::Event.can_receive?(@client, name: 'Page.loadEventFired',
+                                         other_property: true).must_equal false
+      end
     end
     describe 'when page_events is true' do
@@ -77,6 +81,10 @@ describe WebkitRemote::Event do
         WebkitRemote::Event.can_receive?(@client, name: 'Page.loadEventFired').
                             must_equal true
       end
+      it 'should ignore extra properties' do
+        WebkitRemote::Event.can_receive?(@client, name: 'Page.loadEventFired',
+                                         other_property: true).must_equal true
+      end
     end
   end
 end

data/webkit_remote.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = "webkit_remote"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -44,6 +44,8 @@ Gem::Specification.new do |s|
     "test/fixtures/html/load.html",
     "test/fixtures/html/network.html",
     "test/fixtures/html/runtime.html",
+    "test/fixtures/js/network.js",
+    "test/fixtures/png/network.png",
     "test/helper.rb",
     "test/webkit_remote/browser_test.rb",
     "test/webkit_remote/client/console_test.rb",

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webkit_remote
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease:
 platform: ruby
 authors:
@@ -255,6 +255,8 @@ files:
 - test/fixtures/html/load.html
 - test/fixtures/html/network.html
 - test/fixtures/html/runtime.html
+- test/fixtures/js/network.js
+- test/fixtures/png/network.png
 - test/helper.rb
 - test/webkit_remote/browser_test.rb
 - test/webkit_remote/client/console_test.rb
@@ -284,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 40721145812420836
+      hash: 2944886604051237369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: