isomorfeus-puppetmaster 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c66c2a8eba9037abe68c0177fdcf96fe31e8c104b2e6ecca567e1f1b60cea5f
-  data.tar.gz: 54b9eb1e831ef954be20274abe8c124b5b383f0c2b46a43fab65bc2fb387fc33
+  metadata.gz: 422c2bb4f0581a37a50491b60bfb2b0a44b96acd903c8aaf5460d233d70eb8bf
+  data.tar.gz: cc52402be32baecea8e5d70071cdc9d94684ab682eec4e36f124b9185130869b
 SHA512:
-  metadata.gz: 78b57f81714fec79731ae8a7d835f0cb854ec92c73b4027f7304fa9a7e09e07be026767c09f2486eb212ee196cf0e32786e8a99cbab1caa282270ef568931d29
-  data.tar.gz: 80a75a8a26dd49daf2db672dbbaf5405e30700c433823866ecc99bdb54cd45bd035b99a7c810561600376bc0dce382c9a8627ec482713bf3be906c3ee8a4664d
+  metadata.gz: 89f9b3910c274388f23623aded55d5ac5e94d620ff77586bd6f597b6cb723540b9c91d586a4f7e95e869b801832a2dee13f9db88706a32578a2e7ce3e5b52bb1
+  data.tar.gz: 0e79a45d2fd530702f95180cb5710b9e304244b76bfe8fe0f59ca2e62c71a349d4c8fb0704e9fc3a93f59df5731187f1086660077c7e385ff5986b2796f3d58a

data/README.md

@@ -1,7 +1,7 @@
 # isomorfeus-puppetmaster
 
 A framework for acceptance tests or simply running tests in a headless browser. 
-Comes with drivers for chromium headless, firefox and jsdom.
+Comes with drivers for chromium headless and jsdom.
 Allows for writing javascript tests in pure ruby.
 
 ### Community and Support
@@ -19,10 +19,9 @@ In Gemfile:
 
 Also requires the following npm modules with recommended versions:
 
-- [puppeteer 1.16.0](https://github.com/GoogleChrome/puppeteer#readme) - for the chromium driver
-- [puppeteer-firefox 0.5.0](https://www.npmjs.com/package/puppeteer-firefox) - for the firefox driver
-- [jsdom 14.0.0](https://github.com/jsdom/jsdom#readme) - for the jsdom driver
-- [canvas 2.4.1](https://github.com/Automattic/node-canvas) - for the jsdom driver (optional)
+- [puppeteer 2.0.0](https://github.com/GoogleChrome/puppeteer#readme) - for the chromium driver
+- [jsdom 15.2.1](https://github.com/jsdom/jsdom#readme) - for the jsdom driver
+- [canvas 2.6.0](https://github.com/Automattic/node-canvas) - for the jsdom driver (optional)
 
 Simply install them in your projects root. Puppetmaster also depends on isomorfeus-speednode, which will be installed automatically.
 Speednode will pickup the node modules then from the projects root node_modules directory.
@@ -33,8 +32,6 @@ Puppetmaster provides these drivers:
 - chromium - a real browser, headless, fast
 - chromium_wsl - as above but with options so it can execute within the Windows Linux WSL
 - chromium_debug - opens a chromium browser window with devtools enabled, useful for debugging tests
-- firefox - real firefox, running headless, not so fast
-- firefox_debug - opens a firefox browser window with devtools enabled, useful for debugging tests
 - jsdom - provides a dom implementation in javascript, can execute javascript in the document, super fast, headless, has certain limitations,
   especially because its not rendering anything (no element bounding box, etc.)
 - jsdom_canvas - jsdom driver with additional support for 'canvas', requires certain libraries to be installed, see: [canvas at github](https://github.com/Automattic/node-canvas)

data/lib/isomorfeus/puppetmaster/document.rb

@@ -69,6 +69,37 @@ module Isomorfeus
         @driver.browser
       end
 
+      def await_ruby(ruby_source = '', &block)
+        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        ruby_source = "#{ruby_source}.then { |result| $promise_result = result; $promise_resolved = true }.fail { |result| $promise_result = result; $promise_resolved = true }"
+        compiled_ruby = compile_ruby_source(ruby_source)
+        if compiled_ruby.start_with?('/*')
+          start_of_code = compiled_ruby.index('*/') + 3
+          compiled_ruby = compiled_ruby[start_of_code..-1]
+        end
+        evaluate_script <<~JAVASCRIPT
+          (function(){
+            Opal.gvars.promise_resolved = false;
+            return #{compiled_ruby}
+          })()
+        JAVASCRIPT
+        have_result = false
+        start = Time.now
+        until have_result do
+          break if (Time.now - start) > 30
+          have_result = evaluate_script 'Opal.gvars.promise_resolved'
+          sleep 0.1 unless have_result
+        end
+        execute_script <<~JAVASCRIPT
+          var result;
+          if (typeof Opal.gvars.promise_result.$to_n === 'function') { result = Opal.gvars.promise_result.$to_n(); }
+          else { result = Opal.gvars.promise_result };
+          delete Opal.gvars.promise_result;
+          delete Opal.gvars.promise_resolved;
+          return result;
+        JAVASCRIPT
+      end
+
       def evaluate_ruby(ruby_source = '', &block)
         ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
         compiled_ruby = compile_ruby_source(ruby_source)

data/lib/isomorfeus/puppetmaster/driver/jsdom.rb

@@ -222,7 +222,7 @@ module Isomorfeus
         def determine_error(message)
           if message.include?('Error: certificate has expired')
             Isomorfeus::Puppetmaster::CertificateError.new(message) unless @ignore_https_errors
-          elsif message.include?('Error: getaddrinfo ENOTFOUND')
+          elsif message.include?('Error: getaddrinfo')
             Isomorfeus::Puppetmaster::DNSError.new(message)
           elsif message.include?('Unknown key: ')
             Isomorfeus::Puppetmaster::KeyError.new(message)
@@ -280,7 +280,7 @@ module Isomorfeus
                 LastRes = null;
                 LastExecutionFinished = false;
     
-                if (err) { return [null, err.message]; }
+                if (err) { return [null, err.toString() + "\\n" + err.stack]; }
                 else { return [res, null]; }
     
               } else {

data/lib/isomorfeus/puppetmaster/driver/jsdom_document.rb

@@ -284,7 +284,7 @@ module Isomorfeus
           @context.eval <<~JAVASCRIPT
             AllDomHandles[#{document.handle}].window.eval(
               "var arguments = #{ "#{args}".gsub('"', '\"') };" +
-              "#{script.gsub('\\', '\\\\\\').gsub('"', '\"').gsub("\n", "\\n")}"
+              "#{script.strip.gsub('\\', '\\\\\\').gsub('"', '\"').gsub("\n", "\\n")}"
             )
           JAVASCRIPT
         rescue ExecJS::ProgramError => e
@@ -295,7 +295,7 @@ module Isomorfeus
           @context.eval <<~JAVASCRIPT
             AllDomHandles[#{document.handle}].window.eval(
               "(function() { var arguments = #{ "#{args}".gsub('"', '\"') };" +
-              "#{script.gsub('\\', '\\\\\\').gsub('"', '\"').gsub("\n", "\\n")}" +
+              "#{script.strip.gsub('\\', '\\\\\\').gsub('"', '\"').gsub("\n", "\\n")}" +
               "})()" 
             )
           JAVASCRIPT

data/lib/isomorfeus/puppetmaster/driver/puppeteer.rb

@@ -246,12 +246,6 @@ module Isomorfeus
           @context.eval 'LastExecutionFinished'
         end
 
-        def firefox_require
-          <<~JAVASCRIPT
-            const MasterPuppeteer = require('puppeteer-firefox');
-          JAVASCRIPT
-        end
-
         def get_result
           res, err_msg = @context.eval 'GetLastResult()'
           raise determine_error(err_msg) if err_msg
@@ -282,11 +276,10 @@ module Isomorfeus
         def puppeteer_launch
           # todo target_handle, puppeteer save path
           puppeteer_require = case @browser_type
-                              when :firefox then firefox_require
                               when :chrome then chromium_require
                               when :chromium then chromium_require
                               else
-                                raise "Browser type #{@browser_type} not supported! Browser type must be one of: chrome, firefox."
+                                raise "Browser type #{@browser_type} not supported!"
                               end
           <<~JAVASCRIPT
             #{puppeteer_require}
@@ -314,7 +307,7 @@ module Isomorfeus
                 LastRes = null;
                 LastExecutionFinished = false;
     
-                if (err) { return [null, err.message]; }
+                if (err) { return [null, err.toString() + "\\n" + err.stack]; }
                 else { return [res, null]; }
     
               } else {
@@ -370,13 +363,11 @@ module Isomorfeus
                 CurrentBrowser = #{launch_line}
                 var page = (await CurrentBrowser.pages())[0];
                 page.setDefaultTimeout(#{@puppeteer_timeout});
-                if (!(BrowserType === 'firefox')) {
-                  var target = page.target();
-                  var cdp_session = await target.createCDPSession();
-                  await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.download_path}'});
-                  if (#{@url_blacklist}.length > 0) { await cdp_session.send('Network.setBlockedURLs', {urls: #{@url_blacklist}}); }
-                  await cdp_session.detach();
-                }
+                var target = page.target();
+                var cdp_session = await target.createCDPSession();
+                await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.download_path}'});
+                if (#{@url_blacklist}.length > 0) { await cdp_session.send('Network.setBlockedURLs', {urls: #{@url_blacklist}}); }
+                await cdp_session.detach();
                 LastResult = RegisterPage(page);
                 LastExecutionFinished = true;
               } catch (err) {

data/lib/isomorfeus/puppetmaster/driver/puppeteer_document.rb

@@ -126,11 +126,9 @@ module Isomorfeus
 
         def document_clear_url_blacklist(document)
           await <<~JAVASCRIPT
-            if (!(BrowserType === 'firefox')) {
-              var cdp_session = await AllPageHandles[#{document.handle}].target().createCDPSession();
-              await cdp_session.send('Network.setBlockedURLs', {urls: []});
-              await cdp_session.detach();
-            }
+            var cdp_session = await AllPageHandles[#{document.handle}].target().createCDPSession();
+            await cdp_session.send('Network.setBlockedURLs', {urls: []});
+            await cdp_session.detach();
           JAVASCRIPT
         end
 
@@ -152,12 +150,7 @@ module Isomorfeus
               }, #{@puppeteer_reaction_timeout});
             });
             AllPageHandles[#{document.handle}].on('response', response_handler);
-            var navigation_watcher;
-            if (BrowserType === 'firefox') {
-              navigation_watcher = AllPageHandles[#{document.handle}].waitFor(1000);
-            } else {
-              navigation_watcher = AllPageHandles[#{document.handle}].waitForNavigation();
-            }
+            var navigation_watcher = AllPageHandles[#{document.handle}].waitForNavigation();
             await AllPageHandles[#{document.handle}].evaluate(function(){ 
               var options = {button: 0, bubbles: true, cancelable: true};
               var node = window;
@@ -290,12 +283,7 @@ module Isomorfeus
               }, #{@puppeteer_reaction_timeout});
             });
             AllPageHandlers[#{document.handle}].on('response', response_handler);
-            var navigation_watcher;
-            if (BrowserType === 'firefox') {
-              navigation_watcher = AllPageHandles[#{document.handle}].waitFor(1000);
-            } else {
-              navigation_watcher = AllPageHandles[#{document.handle}].waitForNavigation();
-            }
+            var navigation_watcher = AllPageHandles[#{document.handle}].waitForNavigation();
             await AllPageHandles[#{document.handle}].evaluate(function(){
               var options = {button: 0, bubbles: true, cancelable: true};
               var node = window;
@@ -323,7 +311,7 @@ module Isomorfeus
         def document_evaluate_script(document, script, *args)
           await <<~JAVASCRIPT
             LastResult = await AllPageHandles[#{document.handle}].evaluate((arguments) => {
-              return #{script} 
+              return #{script.strip} 
             }, #{args});
           JAVASCRIPT
         end
@@ -331,7 +319,7 @@ module Isomorfeus
         def document_execute_script(document, script, *args)
           await <<~JAVASCRIPT
             LastResult = await AllPageHandles[#{document.handle}].evaluate((arguments) => {
-              #{script} 
+              #{script.strip} 
             }, #{args});
           JAVASCRIPT
         end
@@ -589,13 +577,11 @@ module Isomorfeus
             var url = '#{parsed_uri.to_s}';
             new_page.setDefaultTimeout(#{@puppeteer_timeout});
             await new_page.setViewport({width: #{@width}, height: #{@height}});
-            if (!(BrowserType === 'firefox')) {
-              var new_target = new_page.target();
-              var cdp_session = await new_target.createCDPSession();
-              await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.download_path}'});
-              if (#{@url_blacklist}.length > 0) { await cdp_session.send('Network.setBlockedURLs', {urls: #{@url_blacklist}}); }
-              await cdp_session.detach();
-            }
+            var new_target = new_page.target();
+            var cdp_session = await new_target.createCDPSession();
+            await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.download_path}'});
+            if (#{@url_blacklist}.length > 0) { await cdp_session.send('Network.setBlockedURLs', {urls: #{@url_blacklist}}); }
+            await cdp_session.detach();
             var page_handle = RegisterPage(new_page); 
             var result_response = null;
             if (url && url !== '') { 
@@ -677,12 +663,7 @@ module Isomorfeus
               }, #{@puppeteer_reaction_timeout});
             });
             AllPageHandles[#{document.handle}].on('response', response_handler);
-            var navigation_watcher;
-            if (BrowserType === 'firefox') {
-              navigation_watcher = AllPageHandles[#{document.handle}].waitFor(1000);
-            } else {
-              navigation_watcher = AllPageHandles[#{document.handle}].waitForNavigation();
-            }
+            var navigation_watcher = AllPageHandles[#{document.handle}].waitForNavigation();
             await AllPageHandles[#{document.handle}].evaluate(function(){
               var options = {button: 2, bubbles: true, cancelable: true};
               var node = window;
@@ -780,18 +761,16 @@ module Isomorfeus
         end
 
         def document_set_extra_headers(document, headers_hash)
-          await "await AllPageHandles[#{document.handle}].setExtraHTTPHeaders({#{headers_hash.map { |k, v| "'#{k}': '#{v}'" }.join(', ')}});"
+          await "await AllPageHandles[#{document.handle}].setExtraHTTPHeaders(#{Oj.dump(headers_hash, mode: :strict)});"
         end
 
         def document_set_url_blacklist(document, url_array)
           # https://www.chromium.org/administrators/url-blacklist-filter-format
           @url_blacklist = url_array
           await <<~JAVASCRIPT
-            if (!(BrowserType === 'firefox')) {
-              var cdp_session = await AllPageHandles[#{document.handle}].target().createCDPSession();
-              await cdp_session.send('Network.setBlockedURLs', {urls: #{url_array}});
-              await cdp_session.detach();
-            }
+            var cdp_session = await AllPageHandles[#{document.handle}].target().createCDPSession();
+            await cdp_session.send('Network.setBlockedURLs', {urls: #{url_array}});
+            await cdp_session.detach();
           JAVASCRIPT
         end
 

data/lib/isomorfeus/puppetmaster/driver/puppeteer_node.rb

@@ -27,12 +27,7 @@ module Isomorfeus
               }, #{@puppeteer_reaction_timeout});
             });
             AllPageHandles[#{node.document.handle}].on('response', response_handler);
-            var navigation_watcher;
-            if (BrowserType === 'firefox') {
-              navigation_watcher = AllPageHandles[#{node.document.handle}].waitFor(1000);
-            } else {
-              navigation_watcher = AllPageHandles[#{node.document.handle}].waitForNavigation();
-            }
+            var navigation_watcher = AllPageHandles[#{node.document.handle}].waitForNavigation();
             await AllElementHandles[#{node.handle}].executionContext().evaluate(function(node){ 
               var options = {button: 0, bubbles: true, cancelable: true};
               var x = #{x ? x : 'null'};
@@ -95,12 +90,7 @@ module Isomorfeus
               }, #{@puppeteer_reaction_timeout});
             });
             AllPageHandles[#{node.document.handle}].on('response', response_handler);
-            var navigation_watcher;
-            if (BrowserType === 'firefox') {
-              navigation_watcher = AllPageHandles[#{node.document.handle}].waitFor(1000);
-            } else {
-              navigation_watcher = AllPageHandles[#{node.document.handle}].waitForNavigation();
-            }
+            var navigation_watcher = AllPageHandles[#{node.document.handle}].waitForNavigation();
             await AllElementHandles[#{node.handle}].executionContext().evaluate(function(node){
               var options = {button: 0, bubbles: true, cancelable: true};
               var x = #{x ? x : 'null'};
@@ -297,7 +287,7 @@ module Isomorfeus
         def node_evaluate_script(node, script, *args)
           await <<~JAVASCRIPT
             var node_handle = #{node.handle};
-            await AllElementHandles[node_handle].executionContext().evaluateHandle((node, arguments) => {
+            handle = await AllElementHandles[node_handle].executionContext().evaluateHandle((node, arguments) => {
               arguments.unshift(node);
               return #{script};
             }, AllElementHandles[node_handle], #{args[1..-1]});
@@ -475,12 +465,7 @@ module Isomorfeus
               }, #{@puppeteer_reaction_timeout});
             });
             AllPageHandles[#{node.document.handle}].on('response', response_handler);
-            var navigation_watcher;
-            if (BrowserType === 'firefox') {
-              navigation_watcher = AllPageHandles[#{node.document.handle}].waitFor(1000);
-            } else {
-              navigation_watcher = AllPageHandles[#{node.document.handle}].waitForNavigation();
-            }
+            var navigation_watcher = AllPageHandles[#{node.document.handle}].waitForNavigation();
             await AllElementHandles[#{node.handle}].executionContext().evaluate(function(node){
               var options = {button: 2, bubbles: true, cancelable: true};
               var x = #{x ? x : 'null'};
@@ -571,13 +556,7 @@ module Isomorfeus
         def node_style(node, *styles)
           await <<~JAVASCRIPT
             var handle = await AllElementHandles[#{node.handle}].executionContext().evaluateHandle(function(node, styles){
-              var style = window.getComputedStyle(node);
-              if (styles.length > 0) { 
-                return styles.reduce(function(res,name) {
-                  res[name] = style[name];
-                  return res;
-                }, {});
-              } else { return style; }
+              return = window.getComputedStyle(node);
             }, AllElementHandles[#{node.handle}], #{styles});
             LastResult = await handle.jsonValue();
           JAVASCRIPT

data/lib/isomorfeus/puppetmaster/driver_registration.rb

@@ -10,14 +10,6 @@ Isomorfeus::Puppetmaster.register_driver(:chromium_debug) do |app|
   Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chromium, headless: false, devtools: true, app: app)
 end
 
-Isomorfeus::Puppetmaster.register_driver(:firefox) do |app|
-  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :firefox, headless: true, app: app)
-end
-
-Isomorfeus::Puppetmaster.register_driver(:firefox_debug) do |app|
-  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :firefox, headless: false, devtools: true, app: app)
-end
-
 Isomorfeus::Puppetmaster.register_driver(:jsdom) do |app|
   Isomorfeus::Puppetmaster::Driver::Jsdom.new(app: app)
 end

data/lib/isomorfeus/puppetmaster/server_registration.rb

@@ -26,18 +26,16 @@ Isomorfeus::Puppetmaster.register_server :falcon do |app, port, host, **options|
   Rack::Handler::Falcon.run(app, { Host: host, Port: port }.merge(options)).join
 end
 
-Isomorfeus::Puppetmaster.register_server :iodine do |app, port, _host, **options|
+Isomorfeus::Puppetmaster.register_server :iodine do |app, port, host, **options|
   begin
+    require 'iodine'
     require 'iodine/version'
     require 'rack/handler/iodine'
   rescue LoadError
     raise LoadError, "Unable to load 'iodine' as server."
   end
 
-  puts 'Puppetmaster starting Iodine...'
-  puts "* Version #{Iodine::VERSION}"
-
-  Iodine::Rack.run(app, { Host: host, Port: port }.merge(options)).join
+  Iodine::Rack.run(app, { Host: host, Port: port }.merge(options))
 end
 
 Isomorfeus::Puppetmaster.register_server :puma do |app, port, host, **options|

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.2.5'
-end
+  PUPPETMASTER_VERSION = '0.3.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.11
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.31
+        version: 0.7.36
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.31
+        version: 0.7.36
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Acceptance testing for isomorfeus.