qat-web 6.1.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d68e9065fad78da0faeae6edd261f76f9c2afca7a4b6a9c9032603edffea21
-  data.tar.gz: 5530cb9a8c37d1d930297c270a780c4e1a89516d370e3e25e142c2c50a3c3f70
+  metadata.gz: 1c2d1b0213253a59851177f4c3deab93a1b917a1b6fdc377489f4c64a2d40578
+  data.tar.gz: 7d0a48a39e34dc27e675a3fa9147184540234feaf206c3b6f93803b8d81c7a40
 SHA512:
-  metadata.gz: 7174abc47b1c79a9bed227ba151d9769bd4b660194137b21e820ce7ab0970616b265eab2924a8a2742831823719ea39f628bbc2925dd757e66c98fd1a0faba23
-  data.tar.gz: 78d04f134561aceb6a00c0ed197d6cf56afcb9002a9bc8018a6951e56533d1e0bd46f332a88c496939c03b103283743f3fed8f6a633e2cb302ba3d1abbbdc4f4
+  metadata.gz: 5494488e766199f13cdefe63932109742ae9116c0db27dd6b8d5e387b29eedde20f7acff54630287fef110320ef2a86c39717742c90029cc3895b50bd842eb02
+  data.tar.gz: 89ffa58aca9a2db20caeb29eb4bac1614991569ce3212b367fa5a6584dc38d489d68e081db39ee6b914d8a746f5cb7c7aa3ed5a97f62001677b88c2d76a45711

data/lib/qat/web/browser/html_dump.rb

@@ -17,23 +17,36 @@ module QAT::Web
       #@return [String/NilClass] File path to where the HTML dump file was saved or nil if the browser doesn't support HTML dumps
       #@since 1.0.0
       def take_html_dump(page=Capybara.current_session, path=html_dump_path)
-        log.info { "Saving HTML dump to #{path}" }
         raise ArgumentError.new "File #{path} already exists! Choose another filename" if ::File.exists? path
-        path = page.save_page path
+        log.info { "Saving HTML dump to #{path}" }
+        path = read_html_dump page ,path
         log.info { "HTML dump available" }
-        ::File.basename(path)
+        path
       rescue Capybara::NotSupportedByDriverError
         log.warn { "Driver #{page.mode} does not support HTML dumps!" }
         return nil
       end
 
+
+      ##Helper for reading file, in cucumber 6 this could be reverted to path directly
+      def read_html_dump page, dump_path
+        file = page.save_page dump_path
+        dump_path_read = File.open file
+        dump_path_read.read
+      end
+
       #Default HTML dump path. Can be set with {#html_dump_path=}.
       #@return [String] HTML dump path
       #@since 1.0.0
+
       def html_dump_path
         @html_dump_path || ::File.join('public', "browser_#{Time.new.strftime("%H%M%S%L")}.html")
       end
 
+      def html_dump_filename
+        File.basename(@html_dump_path)
+      end
+
       #Set new default HTML dump path.
       #@param path [String] HTML dump path
       #@since 1.0.0

data/lib/qat/web/browser/screenshot.rb

@@ -16,17 +16,29 @@ module QAT::Web
       #@param path [String] File path to save screenshot file
       #@return [String/NilClass]File path to where the screenshot file was saved or nil if the browser doesn't support screenshots
       #@since 1.0.0
-      def take_screenshot page=Capybara.current_session, path=screenshot_path
-        log.info {"Saving screenshot to #{path}"}
+      def take_screenshot page = Capybara.current_session ,  path = screenshot_path
+        log.info { "Saving screenshot to #{path}" }
         raise ArgumentError.new "File #{path} already exists! Choose another filename" if ::File.exists? path
-        path = page.save_screenshot path
-        log.info {"Screenshot available"}
+        path = read_screenshot_file page, path
+        log.info { "Screenshot available" }
         path
       rescue Capybara::NotSupportedByDriverError
         log.warn {"Driver #{page.mode} does not support screenshots!"}
         return nil
       end
 
+      ##Helper for reading file, in cucumber 6 this could be reverted to path directly
+      def read_screenshot_file page, image_path
+        file            = page.save_page image_path
+        image_path_read = File.open file
+        image_path_read.read
+      end
+
+
+      def screenshot_filename
+        File.basename(@screenshot_path)
+      end
+
       #Default screenshot path. Can be set with {#screenshot_path=}.
       #@return [String] Screenshot path
       #@since 1.0.0

data/lib/qat/web/generator.rb

@@ -1,32 +1,57 @@
 require_relative '../../../lib/qat/web/version'
 require 'fileutils'
+require 'gemnasium/parser'
+
 module QAT::Web
   #Module for the various generators used in the CLI utility
   #@since 6.1.0
   module Generator
     include FileUtils
     extend FileUtils
-
     # Adds a files QAT Web module to the current project
     def add_module(stdout, opts)
-
       stdout.puts "Adding files to project" if opts[:verbose]
-      cp_r ::File.join(::File.dirname(__FILE__), 'generator', 'project', '.'), Dir.pwd, opts
-      ::File.write('Gemfile', <<-GEMFILE, mode: 'a')
-      
 
+      # Read GemFile of new project
+      path = File.join(Dir.pwd, 'Gemfile')
+      has_qatweb = verify_gems path, 'qat-web', verbose: opts[:verbose]
+      if has_qatweb
+        puts "Module already integrated"
+      else
+        add_gem_dependency path, 'qat-web', verbose: opts[:verbose], version: QAT::Web::VERSION
+        add_gem_dependency path, 'headless', verbose: opts[:verbose]
+        add_gem_dependency path, 'selenium-webdriver', verbose: opts[:verbose]
+        cp_r ::File.join(::File.dirname(__FILE__), 'generator', 'project', '.'), Dir.pwd, opts
+      end
+    end
+
+    def verify_gems (gemfile_path, gem, opts = {})
+      file = File.read(gemfile_path)
+      gemfile = Gemnasium::Parser.gemfile(file)
+      dependencies = gemfile.dependencies
+      found_gem = dependencies.find {|i| i.name == gem}
+      puts "Found gem: #{found_gem}"
+      puts "gem #{gem} found? #{!found_gem.nil?}" if opts[:verbose]
+
+      if found_gem
+        return true
+      else
+        return false
+      end
+    end
 
-# QAT-Web is a browser controller for Web testing (https://github.com/readiness-it/qat-web)
-gem 'qat-web', '~> 6.1'
+    def add_gem_dependency (gemfile_path, gem, opts = {})
+      version = opts[:version]
+      line = "\n\ngem '#{gem}'#{version ? ", '>= #{version}'" : ''}"
+      puts "adding dependencies #{gem} to Gemfile" if opts[:verbose]
+      write_to_gemfile gemfile_path, line
+    end
 
-# Ruby headless display interface (http://leonid.shevtsov.me/en/headless)
-gem 'headless' #optional
 
-# The next generation developer focused tool for automated testing of webapps (https://github.com/seleniumhq/selenium)
-gem 'selenium-webdriver' #optional
-      GEMFILE
+    def write_to_gemfile filename, line
+      ::File.write(filename, line, mode: 'a')
     end
 
-    module_function :add_module
+    module_function :add_module, :write_to_gemfile, :add_gem_dependency, :verify_gems
   end
 end

data/lib/qat/web/generator/project/features/web_example.feature

@@ -5,7 +5,7 @@ Feature: some feature
   I want to specify scenarios
 
 
-  @test#4 @dummy_test
+  @test#10 @dummy_test
   Scenario: Navigate to google page
     When I navigate to home page
     Then I can interact with home page

data/lib/qat/web/hooks/html_dump.rb

@@ -15,7 +15,7 @@ After do |scenario|
   if scenario.failed?
     if QAT::Web::Exceptions::HTML_DUMP.any? { |exception| scenario.exception.kind_of?(exception) }
       # Embeds an existing HTML dump to Cucumber's HTML report
-      embed(QAT::Web::Browser::HTMLDump.take_html_dump, 'text/plain', 'HTML dump')
+      attach(QAT::Web::Browser::HTMLDump.take_html_dump, 'text/html')
     end
   end
 end

data/lib/qat/web/hooks/screenshot.rb

@@ -14,7 +14,7 @@ end
 After do |scenario|
   if scenario.failed?
     if QAT::Web::Exceptions::SCREENSHOT.any? { |exception| scenario.exception.kind_of?(exception) }
-      embed QAT::Web::Browser::Screenshot.take_screenshot, 'image/png', 'Screenshot'
+      attach QAT::Web::Browser::Screenshot.take_screenshot, 'image/png'
     end
   end
 end

data/lib/qat/web/version.rb

@@ -4,6 +4,6 @@ module QAT
 #@since 1.0.0
   module Web
     # Represents QAT-Web's version
-    VERSION = '6.1.0'
+    VERSION = '7.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qat-web
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - QAT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qat-cucumber
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: qat-devel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: headless
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: little-plugger
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gemnasium-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
     QAT-Web is a browser controller for Web testing, with support for various browsers and webdrivers.
     Includes various classes for easier planning and implementation of web interactions, using the Page Objects Pattern.
@@ -281,15 +295,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: QAT-Web is a browser controller for Web testing