isomorfeus-puppetmaster 0.6.12 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7381eb86e0aebdfcc20a8aab6da28f9015f61e544f967ae8ed7dff93d0066e
-  data.tar.gz: 4ef4dd695aea946f494169161bfe8e250dcfa21c27eafe19d0031136e39264d4
+  metadata.gz: 269dd1f6465a3861c8590f471d3db376b11a0570fa4bf97bd44b9dfb5d9c1e42
+  data.tar.gz: 0315a46480c8e60a185b5ad3e8fd5649eecb937cb9c606ac6e3ab2e70e57a454
 SHA512:
-  metadata.gz: dfe2342ae411f16d9c83ae2479a159bcca95de422ec2aca82aad9eb6cffa2e38312aee0835ea3c112b1dd225dc9ac1aff3559400bb8648116fb93186eb63ca6c
-  data.tar.gz: 06e936622b8438b32e51b7c36cda934e60470919fe075e176a2b160dd5533101471cc59bda314bf6c54ed4bd715d56fa39d799a35387c1536835aa88ea59c433
+  metadata.gz: d52eb1625c95027d9ef3d7b3f57c7742d07307bf650f7b7545ef222bb6b4135500229670bf95dfc5e2081a41f623536d005cf5fcf392c887c03e7b4c7c75c263
+  data.tar.gz: c1af261f57a1f1ad3cce47a7cb2b10ad8c3b539300d98e925918db666231de4f72d8c5b606de64089af02cf79f3296596efbcce60a909702dc2a63808a77e8b1

data/README.md

@@ -3,9 +3,10 @@
   <br/>
 Isomorfeus Puppetmaster<br/>
 </h1>
+
 A framework for acceptance tests or simply running tests in a headless browser.
 Allows for writing javascript browser tests in pure ruby.
-It is tailored for Isomorfeus and using [puppeteer-ruby](https://github.com/YusukeIwaki/puppeteer-ruby).
+It is tailored for Isomorfeus and using [puppeteer-ruby](https://github.com/YusukeIwaki/puppeteer-ruby)
 
 ### Community and Support
 At the [Isomorfeus Framework Project](https://isomorfeus.com)
@@ -52,6 +53,16 @@ A document consists of elements. Simply working with just pages, documents and e
 1. Find something
 2. Interact with it
 
+## Sessions
+Using `visit` will open a default session. However, additional browser sessions may be opened with:
+```ruby
+s = new_session() # additional args may be passed, like headless: false, devtools: true
+# now the session can be interacted with:
+s.visit('/')
+t = new_session() # multiple sessions may be active at the same time
+t.visit('/')
+```
+
 ## Pages
 A page is a Puppeteer::Page and provides its complete API plus some additional convenience methods.
 The drivers opens a empty default page, to use that and go to the apps root page:
@@ -75,6 +86,13 @@ Both open pages can then be independently interacted with:
 page.visit('/go')
 page2.goto('/location')
 ```
+
+For debugging:
+```ruby
+page = visit('/', headless: false, devtools: true)
+```
+This will close the current browser if the options for headless and devtools dont match, and open a new one with the supplied headless and devtools options.
+
 ### Pages and Ruby
 
 Ruby can be executed within pages by simply providing a block or a string:

data/lib/isomorfeus/puppetmaster/dsl.rb

@@ -3,7 +3,7 @@ module Isomorfeus
     module DSL
       @@launch_options = nil
 
-      def set_launch_options(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
+      def set_launch_options(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: false, dumpio: nil,
                              env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
                              headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                              product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)
@@ -34,11 +34,11 @@ module Isomorfeus
         session.default_page
       end
 
-      def goto(uri, referer: nil, timeout: nil, wait_until: 'networkidle0')
-        session.goto(uri, referer: referer, timeout: timeout, wait_until: wait_until)
+      def visit(uri, referer: nil, timeout: nil, wait_until: 'networkidle0', headless: true, devtools: false)
+        session(headless: headless, devtools: devtools).visit(uri, referer: referer, timeout: timeout, wait_until: wait_until, headless: headless, devtools: devtools)
         session.default_page
       end
-      alias_method :visit, :goto
+      alias_method :goto, :visit
 
       def isomorphic(ruby_source = '', &block)
         ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
@@ -56,7 +56,7 @@ module Isomorfeus
         Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, &block)
       end
 
-      def new_session(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
+      def new_session(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: false, dumpio: nil,
                       env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
                       headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                       product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)
@@ -109,8 +109,8 @@ module Isomorfeus
         Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
       end
 
-      def session
-        @@puppetmaster_session ||= new_session(app: Isomorfeus::Puppetmaster.served_app)
+      def session(headless: true, devtools: false)
+        @@puppetmaster_session ||= new_session(app: Isomorfeus::Puppetmaster.served_app, headless: headless, devtools: devtools)
       end
     end
   end

data/lib/isomorfeus/puppetmaster/server/executor_middleware.rb

@@ -18,17 +18,22 @@ module Isomorfeus
             unless request.body.nil?
               request_hash = Oj.load(request.body.read, mode: :strict)
               if request_hash['key'] != @@request_key
+                STDERR.puts "wrong key"
                 response = Rack::Response.new(Oj.dump({ 'error' => 'wrong key given, execution denied' }),
                                              401,
                                              'Content-Type' => 'application/json')
               else
                 begin
+                  if Isomorfeus.respond_to?(:init_store)
+                    Isomorfeus.init_store
+                    Isomorfeus.store.clear! if Isomorfeus.store.respond_to?(:clear!)
+                  end
                   result = TOPLEVEL_BINDING.eval(request_hash['code']) if request_hash['code']
                   response = Rack::Response.new(Oj.dump({ 'result' => result }),
                                                 200,
                                                 'Content-Type' => 'application/json')
                 rescue Exception => e
-                  response = Rack::Response.new(Oj.dump({ 'error' => "#{e.class}: #{e.message}", 'backtrace' => e.backtrace.join("\n") }),
+                  response = Rack::Response.new(Oj.dump({ 'error' => "#{e.class}: #{e.message}", 'backtrace' => e.backtrace&.join("\n") }),
                                                 200,
                                                 'Content-Type' => 'application/json')
                 end

data/lib/isomorfeus/puppetmaster/session.rb

@@ -4,23 +4,24 @@ module Isomorfeus
       TIMEOUT = 30000 # milliseconds
 
       attr_accessor :app, :browser, :default_page, :product, :response
+      attr_reader :headless, :devtools
 
-      def initialize(app:, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
+      def initialize(app:, args: nil, channel: nil, default_viewport: nil, devtools: false, dumpio: nil,
                      env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
                      headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                      product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)
-        @app = app
+        @parameters = binding.local_variables.map { |v| [v, binding.local_variable_get(v)] }.to_h
+        @parameters[:channel] = @parameters[:channel].to_s if channel
+        @parameters[:timeout] = TIMEOUT unless timeout
+        @app = @parameters.delete(:app)
+        @headless = headless
+        @devtools = devtools
+        @channel = channel
+        default_viewport
         product = product.to_s
-        @product = %w[chrome firefox].include?(product) ? product : 'chrome'
-        @browser = ::Puppeteer.launch(args: args, channel: channel&.to_s, devtools: devtools, default_viewport: default_viewport,
-                                      dumpio: dumpio, env: env, executable_path: executable_path, handle_SIGINT: handle_SIGINT,
-                                      handle_SIGTERM: handle_SIGTERM, handle_SIGHUP: handle_SIGHUP, headless: headless,
-                                      ignore_default_args: ignore_default_args, ignore_https_errors: ignore_https_errors,
-                                      pipe: pipe, product: product, slow_mo: slow_mo, timeout: timeout ? timeout : TIMEOUT,
-                                      user_data_dir: user_data_dir)
-        @original_user_agent = @browser.user_agent
-        @default_page = @browser.new_page
-        @default_page.puppetmaster_session = self
+        @parameters[:product] = %w[chrome firefox].include?(product) ? product : 'chrome'
+        @product = @parameters[:product]
+        launch_browser
         ObjectSpace.define_finalizer(self, self.class.close_browser(self))
       end
 
@@ -40,12 +41,18 @@ module Isomorfeus
         @browser.pages
       end
 
-      def goto(uri, referer: nil, timeout: nil, wait_until: 'networkidle0')
+      def visit(uri, referer: nil, timeout: nil, wait_until: 'networkidle0', headless: true, devtools: false)
+        if @headless != headless || @devtools != devtools
+          @browser.close
+          @headless = headless
+          @devtools = devtools
+          launch_browser
+        end
         parsed_uri = parse_uri(uri)
         @response = @default_page.goto(parsed_uri.to_s, referer: referer, timeout: timeout, wait_until: wait_until)
         @default_page
       end
-      alias_method :visit, :goto
+      alias_method :goto, :visit
 
       def network_conditions
         ::Puppeteer::NETWORK_CONDITIONS
@@ -144,6 +151,15 @@ module Isomorfeus
           instance.browser.close if instance.browser
         end
       end
+
+      def launch_browser
+        @parameters[:headless] = @headless
+        @parameters[:devtools] = @devtools
+        @browser = ::Puppeteer.launch(**@parameters)
+        @original_user_agent = @browser.user_agent
+        @default_page = @browser.new_page
+        @default_page.puppetmaster_session = self
+      end
     end
   end
 end

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.6.12'
+  PUPPETMASTER_VERSION = '0.6.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.15
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport