isomorfeus-puppetmaster 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64b6ee2938a18c7a1c4ecfbfb021cdd9a64ea504cadd8408c474e4970725aad8
-  data.tar.gz: 943d10b0067de804930c1a516c02d6066bd33dea9fd43c134d4870328ae760e1
+  metadata.gz: 3a4b1855e0c0b1039666aa3ae0c5b1e1a8b2bb0c8b424dc7bc81bcd446fa88e4
+  data.tar.gz: e932a68c21221b7b526496c3e16f7d1eec0f4342ad625228771de054e944d88e
 SHA512:
-  metadata.gz: 3e22af9d2d68ca242eeb94129cb70c205e296d85fae0eea43edea8830d1950bcd834b11071ac92ef7f41655fe08f02dad00a8c768ddd71a5eaee98fe4299caeb
-  data.tar.gz: 22e3a26aa8c6f14714e49e9949b0d853cee180bf7989242747a459d45301c6c6caf09209601e53a5e9f57037cec91db13c1a28016aab437694c07b6bf6ec1c55
+  metadata.gz: 725d868d6bffc3c3ee9e8e105c26804b96b34db21dab68373e72f5c2f22ca2ea59f7a3d013484fcaf7cc388bd4e5d67f9621c102ac2737e290365aca06e0d948
+  data.tar.gz: 89fdfe7e7605221e593056db787d0a2ae01d57c607ac0e4d1d3a3151334ba7bf8e6a2240f631a86bc6d321e8926ddefe1f8dee0bc2894ae9a46a1a15ba001983

data/README.md

@@ -1,28 +1,23 @@
-# isomorfeus-puppetmaster
-
-A framework for acceptance tests or simply running tests in a headless browser. 
-Comes with drivers for chrome headless.
+<h1 align="center">
+  <img src="https://github.com/isomorfeus/isomorfeus-puppetmaster/blob/master/Logo.png?raw=true" align="center" width="234" height="453" />
+  <br/>
+Isomorfeus Puppetmaster<br/>
+</h1>
+A framework for acceptance tests or simply running tests in a headless browser.
+Comes with drivers for chromium headless.
 Allows for writing javascript browser tests in pure ruby.
 
 ### Community and Support
 At the [Isomorfeus Framework Project](http://isomorfeus.com)
 
-## Running on:
-- [CircleCI](https://circleci.com): [![CircleCI](https://circleci.com/gh/isomorfeus/isomorfeus-puppetmaster/tree/master.svg?style=svg)](https://circleci.com/gh/isomorfeus/isomorfeus-puppetmaster/tree/master)
-- [SemaphoreCI 2.0](https://semaphoreci.com): (not yet available)
-- [TravisCI](https://travis-ci.org): [![Build Status](https://travis-ci.org/isomorfeus/isomorfeus-puppetmaster.svg?branch=master)](https://travis-ci.org/isomorfeus/isomorfeus-puppetmaster)
- 
 ## Installation
 
 In Gemfile:
 `gem 'isomorfeus-puppetmaster'`, then `bundle install`
 
-Also requires the following npm modules with recommended versions:
-
-- [puppeteer 10.2.x](https://github.com/GoogleChrome/puppeteer#readme) - for the chrome driver
+Comes included with:
 
-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.
+- [puppeteer-core](https://github.com/GoogleChrome/puppeteer#readme) - for the chromium driver
 
 ## Configuration
 
@@ -63,13 +58,13 @@ There are Browsers which may have windows or tabs, which translate to targets or
 In Puppetmaster, which is focusing on headless testing, the main "thing" is **just a document**. Its possible to open many documents at once, but what exactly a document is contained in,
 a window or tab or browser or target or whatever, is not of interest.
 A document consists of nodes. Simply working with just documents and nodes makes testing a lot simpler.
-``` 
+```
 document
     |____head (is a node)
     |      |
     |      |___more nodes
     |      |___...
-    | 
+    |
     |____body (is a node)
            |
            |___more nodes
@@ -132,7 +127,7 @@ TODO
 #### DOM changes by Javascript, Timing
 
 TODO
- 
+
 ## Nodes
 
 ### Finding Nodes ...

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

@@ -252,12 +252,22 @@ module Isomorfeus
         def launch_line
           string_options = []
           options = @options.dup
-          string_options << "ignoreHTTPSErrors: #{options.delete(:ignore_https_errors)}" if options.has_key?(:ignore_https_errors)
-          string_options << "executablePath: '#{options.delete(:executable_path)}'" if options.has_key?(:executable_path)
+          string_options << "ignoreHTTPSErrors: #{options.delete(:ignore_https_errors)}" if options.key?(:ignore_https_errors)
+          if Gem::Platform.local.os == 'linux' && Gem::Platform.local.cpu.start_with?('arm')
+            chromium_path = if options.key?(:executable_path)
+                              options.delete(:executable_path)
+                            else
+                              Isomorfeus::Speednode::NodeCommand.which(['chromium'])
+                            end
+            raise "Chromium not found. Please install chromium manually." unless chromium_path
+            string_options << "executablePath: '#{chromium_path}'"
+          else
+            string_options << "executablePath: '#{options.delete(:executable_path)}'" if options.key?(:executable_path)
+          end
           options.each do |option, value|
             string_options << "#{option.to_s.camelize(:lower)}: #{value}"
           end
-          string_options << "userDataDir: '#{Dir.mktmpdir}'" unless @options.has_key?(:user_data_dir)
+          string_options << "userDataDir: '#{Dir.mktmpdir}'" unless @options.key?(:user_data_dir)
           string_options << "defaultViewport: { width: #{@width}, height: #{@height} }"
           string_options << "pipe: true"
           # string_options << "args: ['--disable-popup-blocking']"
@@ -283,16 +293,16 @@ module Isomorfeus
             var LastErr = null;
             var LastExecutionFinished = false;
             var LastHandleId = 0;
-    
+
             var AllPageHandles = {};
             var AllElementHandles = {};
-    
+
             var CurrentBrowser = null;
             var ConsoleMessages = {};
-    
+
             var ModalText = null;
             var ModalTextMatched = false;
-    
+
             const EnsureBrowser = async function() {
               var revisions = await BrowserFetcher.localRevisions();
               if (!revisions.includes(default_revision)) {
@@ -306,48 +316,48 @@ module Isomorfeus
               if (LastExecutionFinished === true) {
                 var err = LastErr;
                 var res = LastResult;
-    
+
                 LastErr = null;
                 LastRes = null;
                 LastExecutionFinished = false;
-    
+
                 if (err) { return [null, {name: err.name, message: err.message, stack: err.stack}]; }
                 else { return [res, null]; }
-    
+
               } else {
                 var new_err = new Error('Last command did not yet finish execution!');
                 return [null, {name: new_err.name, message: new_err.message, stack: new_err.stack}];
               }
             };
-    
+
             const DialogAcceptHandler = async (dialog) => {
               var msg = dialog.message()
               ModalTextMatched = (ModalText === msg);
               ModalText = msg;
               await dialog.accept();
             }
-    
+
             const DialogDismissHandler = async (dialog) => {
               var msg = dialog.message()
               ModalTextMatched = (ModalText === msg);
               ModalText = msg;
               await dialog.dismiss();
             }
-    
+
             const RegisterElementHandle = function(element_handle) {
               var entries = Object.entries(AllElementHandles);
-              for(var i = 0; i < entries.length; i++) { 
+              for(var i = 0; i < entries.length; i++) {
                 if (entries[i][1] === element_handle) { return entries[i][0]; }
               }
               LastHandleId++;
               var handle_id = LastHandleId;
               AllElementHandles[handle_id] = element_handle;
-              return handle_id; 
+              return handle_id;
             };
-    
+
             const RegisterPage = function(page) {
               var entries = Object.entries(AllPageHandles);
-              for(var i = 0; i < entries.length; i++) { 
+              for(var i = 0; i < entries.length; i++) {
                 if (entries[i][1] === page) { return entries[i][0]; }
               }
               LastHandleId++;
@@ -360,12 +370,14 @@ module Isomorfeus
               AllPageHandles[handle_id].on('pageerror', (error) => {
                 ConsoleMessages[handle_id].push({level: 'error', location: '', text: error.message});
               });
-              return handle_id; 
+              return handle_id;
             };
-    
+
             (async () => {
               try {
-                await EnsureBrowser();
+                if (process.arch !== 'arm') {
+                  await EnsureBrowser();
+                }
                 CurrentBrowser = #{launch_line}
                 var page = (await CurrentBrowser.pages())[0];
                 page.setDefaultTimeout(#{@puppeteer_timeout});

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

@@ -4,7 +4,7 @@ module Isomorfeus
       module PuppeteerDocument
         def document_accept_alert(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -19,12 +19,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_accept_confirm(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -39,12 +39,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_accept_leave_page(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -59,12 +59,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_accept_prompt(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -79,7 +79,7 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_all_text(document)
@@ -197,7 +197,7 @@ module Isomorfeus
 
         def document_dismiss_confirm(document, **options, &block)
           # TODO
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogDismissHandler);
@@ -212,12 +212,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogDismissHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::ModalNotFound if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::ModalNotFound if options.key?(:text) && !matched
         end
 
         def document_dismiss_leave_page(document, **options, &block)
           # TODO
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogDismissHandler);
@@ -232,12 +232,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogDismissHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::ModalNotFound if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::ModalNotFound if options.key?(:text) && !matched
         end
 
         def document_dismiss_prompt(document, **options, &block)
           # TODO
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogDismissHandler);
@@ -252,7 +252,7 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogDismissHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::ModalNotFound if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::ModalNotFound if options.key?(:text) && !matched
         end
 
         def document_dispatch_event(document, name, event_type = nil, **options)
@@ -649,12 +649,12 @@ module Isomorfeus
           # todo
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           final_options = ["encoding: 'base64'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
-          final_options << "fullPage: #{options.delete(:full)}" if options.has_key?(:full)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
+          final_options << "fullPage: #{options.delete(:full)}" if options.key?(:full)
           options.each do |k,v|
             final_options << "#{k.to_s.camelize(:lower)}: #{v}"
           end
@@ -715,12 +715,12 @@ module Isomorfeus
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagepdfoptions
           absolute_path = File.absolute_path(path)
           final_options = ["path: '#{absolute_path}'"]
-          final_options << "format: '#{options.delete(:format)}'" if options.has_key?(:format)
-          final_options << "headerTemplate: `#{options.delete(:header_template)}`" if options.has_key?(:header_template)
-          final_options << "footerTemplate: `#{options.delete(:footer_template)}`" if options.has_key?(:footer_template)
-          final_options << "pageRanges: '#{options.delete(:page_ranges)}'" if options.has_key?(:page_ranges)
-          final_options << "width: '#{options.delete(:width)}'" if options.has_key?(:width)
-          final_options << "height: '#{options.delete(:height)}'" if options.has_key?(:height)
+          final_options << "format: '#{options.delete(:format)}'" if options.key?(:format)
+          final_options << "headerTemplate: `#{options.delete(:header_template)}`" if options.key?(:header_template)
+          final_options << "footerTemplate: `#{options.delete(:footer_template)}`" if options.key?(:footer_template)
+          final_options << "pageRanges: '#{options.delete(:page_ranges)}'" if options.key?(:page_ranges)
+          final_options << "width: '#{options.delete(:width)}'" if options.key?(:width)
+          final_options << "height: '#{options.delete(:height)}'" if options.key?(:height)
           options.each do |k,v|
             final_options << "#{k.to_s.camelize(:lower)}: #{v}"
           end
@@ -732,12 +732,12 @@ module Isomorfeus
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           absolute_path = File.absolute_path(path)
           final_options = ["path: '#{absolute_path}'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
-          final_options << "fullPage: #{options.delete(:full)}" if options.has_key?(:full)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
+          final_options << "fullPage: #{options.delete(:full)}" if options.key?(:full)
           options.each do |k,v|
             final_options << "#{k.to_s.camelize(:lower)}: #{v}"
           end
@@ -772,10 +772,10 @@ module Isomorfeus
           end
           options[:domain] ||= URI.parse(uri).host
           final_options = []
-          final_options << "expires: #{options.delete(:expires).to_i}" if options.has_key?(:expires)
-          final_options << "httpOnly: #{options.delete(:http_only)}" if options.has_key?(:http_only)
-          final_options << "secure: #{options.delete(:secure)}" if options.has_key?(:secure)
-          final_options << "sameSite: '#{options.delete(:same_site)}'" if options.has_key?(:same_site)
+          final_options << "expires: #{options.delete(:expires).to_i}" if options.key?(:expires)
+          final_options << "httpOnly: #{options.delete(:http_only)}" if options.key?(:http_only)
+          final_options << "secure: #{options.delete(:secure)}" if options.key?(:secure)
+          final_options << "sameSite: '#{options.delete(:same_site)}'" if options.key?(:same_site)
           options.each do |k,v|
             final_options << "#{k}: '#{v}'"
           end

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

@@ -437,11 +437,11 @@ module Isomorfeus
         def node_render_base64(node, **options)
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           final_options = ["encoding: 'base64'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
           box = await "LastResult = await AllElementHandles[#{node.handle}].boundingBox();"
           final_options << "clip: {x: #{box['x']}, y: #{box['y']}, width: #{box['width']}, height: #{box['height']}}"
           options.each { |k,v| final_options << "#{k.to_s.camelize(:lower)}: #{v}" }
@@ -493,11 +493,11 @@ module Isomorfeus
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           absolute_path = File.absolute_path(path)
           final_options = ["path: '#{absolute_path}'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
           box = await "LastResult = await AllElementHandles[#{node.handle}].boundingBox();"
           final_options << "clip: {x: #{box['x']}, y: #{box['y']}, width: #{box['width']}, height: #{box['height']}}"
           options.each { |k,v| final_options << "#{k.to_s.camelize(:lower)}: #{v}" }

data/lib/isomorfeus/puppetmaster/node.rb

@@ -189,20 +189,20 @@ module Isomorfeus
       def has_css?(selector, **options)
         res = find_all(selector)
         return false unless res
-        return false if options.has_key?(:count) && options[:count] != res.size
+        return false if options.key?(:count) && options[:count] != res.size
         return true
       end
 
       def has_text?(text, **options)
         count = visible_text.scan(/#{text}/).size
-        return false if options.has_key?(:count) && options[:count] != count
+        return false if options.key?(:count) && options[:count] != count
         count > 0
       end
 
       def has_xpath?(query, **options)
         res = find_all_xpath(query)
         return false unless res
-        return false if options.has_key?(:count) && options[:count] != res.size
+        return false if options.key?(:count) && options[:count] != res.size
         return true
       end
 

data/lib/isomorfeus/puppetmaster/server.rb

@@ -74,7 +74,7 @@ module Isomorfeus
                    end
         if response.code == '200'
           result_hash = Oj.load(response.body)
-          if result_hash.has_key?('error')
+          if result_hash.key?('error')
             error = RuntimeError.new(result_hash['error'])
             error.set_backtrace(result_hash['backtrace'])
             raise error

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.5.1'
+  PUPPETMASTER_VERSION = '0.5.5'
 end

data/lib/isomorfeus/puppetmaster.rb

@@ -19,7 +19,7 @@ module Isomorfeus
       end
 
       def driver=(drvr)
-        raise "#{drvr}: no such driver registered! Available drivers: #{drivers.keys.join(', ')}." unless drivers.has_key?(drvr)
+        raise "#{drvr}: no such driver registered! Available drivers: #{drivers.keys.join(', ')}." unless drivers.key?(drvr)
         @driver = drvr
       end
 
@@ -52,7 +52,7 @@ module Isomorfeus
       end
 
       def server=(name)
-        raise "#{name}: no such server registered! Available drivers: #{servers.keys.join(', ')}." unless servers.has_key?(name)
+        raise "#{name}: no such server registered! Available drivers: #{servers.keys.join(', ')}." unless servers.key?(name)
         name, options = *name if name.is_a? Array
         @server = if name.respond_to? :call
                     name

data/lib/isomorfeus-puppetmaster.rb

@@ -3,6 +3,11 @@ require 'uri'
 require 'net/http'
 require 'rack'
 require 'opal'
+require 'parser'
+
+# isomorfeus needs kwargs
+Parser::Builders::Default.emit_kwargs = true
+
 require 'unparser'
 require 'method_source'
 require 'securerandom'
@@ -13,8 +18,6 @@ unless ENV["EXECJS_RUNTIME"]
   ExecJS.runtime = ExecJS::Runtimes::Speednode
 end
 
-# require 'uglifier'
-
 require 'isomorfeus/puppetmaster'
 require 'isomorfeus/puppetmaster/self_forwardable'
 require 'isomorfeus/puppetmaster/errors'