superbot 0.1.3 → 0.1.4.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1daf8db5c8573f4ea88fc5b58d7eb2362e84a716baedfbc971bb9ef52cf904e3
-  data.tar.gz: 6ee9f09184abc8015a4c5293f07beb8e18be57dc263d85a84776a0ad2380565c
+  metadata.gz: f96f7642c6913a2137b12f40ecefa344b49b345fa112de19cd5ae284c88ea006
+  data.tar.gz: afd49aafb562eb0ddd366a8ce6fb13a75faede33b125d35bed576dd60e407322
 SHA512:
-  metadata.gz: fcffe77a0b61e4abb99783a35387fd7ef10f66890309bc7991b99f8285edd02cf7a4228a281b4a8048731196f014f30f405da71708d1f5ba32d39cc7bd0dd4cd
-  data.tar.gz: 45859ff06232597c4e9c8322878b0bcddfcacf6d5f0ac8c16f98d0d04b52f4b74acadea45406dafbda8e4a95f079ff04f1cbf05e934ca49ae4207e4ba5301ac2
+  metadata.gz: 5616bb9d61f728884c6b8b688850e25c2ea4c6777ff9a9756aa64f6a9e7f715f98290c58ca36f9d05606fcbd44af0f7a4e4c033a51c4cd686e863689a7371c6d
+  data.tar.gz: 73df24e55278661370984c2c73bd8cb90f06380fd4e13514dce9771ba472d6f7a4a37bb38a726e4b5503920ec6baf0e23ae5f9ae9f1ed130f1b73e84d8f21fa1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot (0.1.3)
+    superbot (0.1.4.rc1)
       clamp (= 1.2.1)
       launchy (= 2.4.3)
       sinatra (= 2.0.3)

data/lib/superbot/capybara/convert.rb

@@ -12,7 +12,7 @@ module Superbot
       end
 
       def call
-        converted_json&.tap { |script| Superbot::Capybara::Runner.run(script) }
+        converted_json
       end
 
       attr_accessor :json
@@ -26,6 +26,7 @@ module Superbot
         when 'scroll'     then
           "page.execute_script('window.scrollBy(0,' + (page.execute_script('return document.body.scrollHeight') * #{action[:amountPercent]} / 100).to_s + ')')"
         when 'resolution' then "page.driver.browser.manage.window.resize_to(#{action[:resolution].join(',')})"
+        when 'has-text'   then "page.assert_text('#{action[:text]}')"
         end
       end
 

data/lib/superbot/capybara/runner.rb

@@ -5,59 +5,58 @@ require 'kommando'
 module Superbot
   module Capybara
     class Runner
-      def initialize(script)
-        @script = script
+      def self.run(script)
+        new.run(script)
       end
 
-      def self.run(*args)
-        new(*args).run
+      def run(script)
+        create_runner
+        runner.in.writeln({ eval: script }.to_json)
       end
 
-      def run
-        run_script
+      def rerun(script)
+        runner.in.writeln({ eval: script }.to_json)
       end
 
+      def kill_session
+        runner&.kill
+      rescue Timeout::Error
+        p # do nothing
+      ensure
+        @runner = nil
+      end
+
+      attr_accessor :script, :runner, :finished
+
       private
 
-      attr_accessor :script
+      def create_runner
+        return if runner
 
-      def run_script
         gem 'superbot-capybara'
 
-        k = Kommando.new "sb-capybara"
-        k.in.writeln({ eval: script }.to_json)
+        @runner = Kommando.new "sb-capybara"
 
-        finished = false
+        @finished = false
 
-        k.out.once(/{"type":"ok".*\n/) do
-          puts "Test succeed"
-          finished = true
+        runner.out.every(/{"type":"ok".*\n/) do
+          puts "Test succeed!"
+          @finished = true
         end
 
-        k.out.once(/{"type":"error".*\n/) do
-          begin
-            parsed_error = JSON.parse(k.out.lines.last, symbolize_names: true)
-            error_message = parsed_error[:message]
-            puts "Test failed with #{error_message}"
+        runner.out.every(/{"type":"error".*\n/) do
+          parsed_error = JSON.parse(runner.out.lines.last, symbolize_names: true)
+          puts "Test failed: #{parsed_error[:message]}"
+          @finished = true
+          if parsed_error[:class].start_with?('Selenium::WebDriver::Error')
+            kill_session
+            puts "", "ERROR: Seems like browser session has been closed, try to run test again to create new session"
           end
-          finished = true
-        end
-
-        k.run_async
-
-        loop do
-          break if finished
-
-          sleep 0.001
         end
 
-        begin
-          k.kill
-        rescue Timeout::Error
-          p # do nothing
-        end
+        runner.run_async
       rescue Gem::LoadError
-        puts "superbot-capybara not installed"
+        abort "superbot-capybara not installed"
       end
     end
   end

data/lib/superbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Superbot
-  VERSION = "0.1.3"
+  VERSION = "0.1.4.rc1"
 end

data/lib/superbot/web.rb

@@ -13,6 +13,7 @@ module Superbot
       @sinatra.set :silent_sinatra, true
       @sinatra.set :silent_webrick, true
       @sinatra.set :silent_access_log, false
+      instance = self
 
       @sinatra.before do
         headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
@@ -30,10 +31,15 @@ module Superbot
       end
 
       @sinatra.post "/__superbot/v1/convert" do
-        Superbot::Capybara::Convert.call(request.body.read)
+        converted_script = Superbot::Capybara::Convert.call(request.body.read)
+        instance.capybara_runner.run(converted_script)
       end
     end
 
+    def capybara_runner
+      @capybara_runner ||= Superbot::Capybara::Runner.new
+    end
+
     def run!
       @sinatra.run_async!
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4.rc1
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -308,9 +308,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6