bucky-core 0.10.4 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3db572b6f3e84c8b087f6377fb6555870d7939a
-  data.tar.gz: 3e89f508f717f428f1d04e33e849fc21ddf0d1dd
+SHA256:
+  metadata.gz: 87798700e382a4c439f45d87da578cc073315d924bfbf6a32e5a59c1606d0bf0
+  data.tar.gz: 2d043e90b4229a3078527a146e7831f8e5900ef790f036735e15c26bfe9dc300
 SHA512:
-  metadata.gz: a64215cd06c5bf53ce5d9f8d00c9c10c89ba1dbfdac12586223904c4f5c2e332323935545e37c46b36a1ca9d8360b693770dd803dc1c314a6c584a60c2fe4f5a
-  data.tar.gz: a9d1771ad211ba033b3f49c15d59d1f60405f82c053ae29fe1a59d3eac2dce8559ee55de3444ddb69b6d83c3d75a8260a906ae44c686e9bb84a0adf19e6fc364
+  metadata.gz: a62d52ae9c9fedf15ea941623b3b5a33fc1188e8cc887b63e17bbee4e7ea12b370a3c23c5e060249486661b9693a77d9b4c6b166c12af1d0e241152bc035c86a
+  data.tar.gz: bfd263087f691afe417cccb52403f70ccf7aa3a9a3962192e55718668f521a89af5e9f14624654d2a56977e59b6b61b206992254a7db74b73fc33c51a4145a86

data/.circleci/config.yml

@@ -37,7 +37,7 @@ jobs:
   unit_test:
     working_directory: ~/bucky-core
     docker:
-      - image: circleci/ruby:2.4.2-node
+      - image: circleci/ruby:2.5.8
         environment:
           CC_TEST_REPORTER_ID: fd7bd9d517bdf8953c4d4803ca4ad7539d12d5c760048b8daf80cbc7d54fb262
     steps:
@@ -62,7 +62,7 @@ jobs:
           ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?
   static_code_analysis:
     docker:
-      - image: circleci/ruby:2.4.2-node
+      - image: circleci/ruby:2.5.8
     steps:
       - checkout
       - type: cache-restore
@@ -77,7 +77,7 @@ jobs:
           path: report.html
   publish_to_rubygems:
     docker:
-      - image: circleci/ruby:2.4.1
+      - image: circleci/ruby:2.5.8
     steps:
       - add_ssh_keys:
           finerprints:

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - 'template/**/*'
     - 'tmp/**/*'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 AbcSize:
   Enabled: false
@@ -61,7 +61,7 @@ MethodLength:
   Enabled: false
 
 ModuleLength:
-  Max: 120
+  Max: 130
   Exclude:
     - 'spec/**/*.rb'
 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4.2-alpine
+FROM ruby:2.5.8-alpine
 ENV LANG ja_JP.UTF-8
 ENV PAGER busybox less
 
@@ -22,6 +22,7 @@ RUN apk update && \
     zlib-dev
 
 ENV BC_DIR /bucky-core/
+ENV PATH /bucky-core/exe/:$PATH
 WORKDIR $BC_DIR
 COPY . $BC_DIR
 

data/Dockerfile.system-test

@@ -1,4 +1,4 @@
-FROM ruby:2.4.2-alpine
+FROM ruby:2.5.8-alpine
 ENV LANG ja_JP.UTF-8
 ENV PAGER busybox less
 
@@ -29,6 +29,7 @@ RUN git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \
     && rm -rf /tmp/bats-core
 
 ENV BC_DIR /bucky-core/
+ENV PATH /bucky-core/exe/:$PATH
 WORKDIR $BC_DIR
 COPY . $BC_DIR
 

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    bucky-core (0.10.3)
+    bucky-core (0.10.7)
       addressable (~> 2.5)
       color_echo (~> 3.1)
-      json (~> 2.1)
-      nokogiri (~> 1.10.4)
+      json (~> 2.3.0)
+      nokogiri (~> 1.11.1)
       parallel (~> 1.11)
       ruby-mysql (~> 2.9)
       selenium-webdriver (~> 3.142)
@@ -18,54 +18,56 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    ast (2.4.0)
+    ast (2.4.1)
     awesome_print (1.8.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    byebug (9.1.0)
+    byebug (11.1.3)
     childprocess (3.0.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     color_echo (3.1.1)
-    debug_inspector (0.0.3)
-    diff-lcs (1.3)
+    debug_inspector (1.0.0)
+    diff-lcs (1.4.4)
     docile (1.1.5)
     hirb (0.7.3)
-    jaro_winkler (1.5.2)
-    json (2.1.0)
-    method_source (0.9.0)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.12.1)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    power_assert (1.1.6)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.5.1)
-      byebug (~> 9.1)
-      pry (~> 0.10)
-    pry-stack_explorer (0.4.9.2)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
-    public_suffix (4.0.3)
+    jaro_winkler (1.5.4)
+    json (2.3.1)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    power_assert (1.2.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    pry-stack_explorer (0.4.13)
+      binding_of_caller (~> 0.7)
+      pry (~> 0.13)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rspec_junit_formatter (0.3.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
@@ -75,8 +77,8 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
     ruby-mysql (2.9.14)
-    ruby-progressbar (1.10.0)
-    rubyzip (2.2.0)
+    ruby-progressbar (1.11.0)
+    rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -90,7 +92,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
-    test-unit (3.3.5)
+    test-unit (3.3.9)
       power_assert
     unicode-display_width (1.5.0)
 
@@ -108,7 +110,8 @@ DEPENDENCIES
   rake (~> 13)
   rspec (~> 3.6)
   rspec_junit_formatter (~> 0.3)
-  rubocop (~> 0.63)
+  rubocop (~> 0.68.1)
+  simplecov (~> 0.15.1)
   simplecov-console (~> 0.4.2)
 
 BUNDLED WITH

data/bucky-core.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   When working with Bucky-management, Bucky-core can also record test results. You can make test results visualization by using Bucky-management.
   DESCRIPTION
-  spec.required_ruby_version = '>= 2.4.2'
+  spec.required_ruby_version = '>= 2.5'
   spec.homepage      = 'https://github.com/lifull-dev/bucky-core'
   spec.license       = 'Apache License 2.0'
 
@@ -36,13 +36,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake',           '~> 13'
   spec.add_development_dependency 'rspec',          '~> 3.6'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3'
-  spec.add_development_dependency 'rubocop',        '~> 0.63'
+  spec.add_development_dependency 'rubocop', '~> 0.68.1'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
 
   spec.add_runtime_dependency 'addressable', '~> 2.5'
   spec.add_runtime_dependency 'color_echo',         '~> 3.1'
-  spec.add_runtime_dependency 'json',               '~> 2.1'
-  spec.add_runtime_dependency 'nokogiri',           '~> 1.10.4'
+  spec.add_runtime_dependency 'json',               '~> 2.3.0'
+  spec.add_runtime_dependency 'nokogiri',           '~> 1.11.1'
   spec.add_runtime_dependency 'parallel',           '~> 1.11'
   spec.add_runtime_dependency 'ruby-mysql',         '~> 2.9'
   spec.add_runtime_dependency 'selenium-webdriver', '~> 3.142'

data/docker-compose.system-test.yml

@@ -8,6 +8,9 @@ services:
     volumes:
       - .:/bucky-core
     tty: true
+    depends_on:
+      - chrome
+      - web
   chrome:
     container_name: bucky-chrome
     image: selenium/standalone-chrome-debug:3.141.59-oxygen

data/exe/bucky

@@ -83,6 +83,9 @@ end
 opts.on('-l', '--label LABEL_NAME') do |v|
   test_cond[:label] = v
 end
+opts.on('--xl', '--exclude_label EXCLUDE_LABEL_NAME') do |v|
+  test_cond[:xlabel] = v
+end
 opts.on('-m', '--link_check_max_times') do |v|
   test_cond[:link_check_max_times] = v.to_i
 end

data/lib/bucky/core/test_core/test_case_loader.rb

@@ -148,6 +148,11 @@ module Bucky
               suite[:cases].delete_if { |c| c[:labels].nil? }
               suite[:cases].delete_if { |c| !(test_cond[:label].sort - [c[:labels]].flatten.sort).empty? }
             end
+            # Exclude by label
+            if test_cond.key? :xlabel
+              # Delete test case that have specify label
+              suite[:cases].delete_if { |c| (test_cond[:xlabel].sort - [c[:labels]].flatten.sort).empty? }
+            end
             # If there is no option, do nothing.
             return suite unless test_cond.key? :case
 

data/lib/bucky/test_equipment/verifications/status_checker.rb

@@ -34,7 +34,11 @@ module Bucky
           # If number of requests is over redirect limit
           return { error_message: "\n[Redirect Error] #{url} is redirected more than #{REDIRECT_LIMIT}" } if redirect_count > REDIRECT_LIMIT
 
-          check_result = check_log_and_get_response(url, device, link_check_max_times, url_log)
+          begin
+            check_result = check_log_and_get_response(url, device, link_check_max_times, url_log)
+          rescue Net::ReadTimeout => e
+            return { error_message: "#{e.message} Please check this url: #{url}" }
+          end
           # If result include response continue to check, else return result
           !check_result.key?(:response) ? (return check_result) : response = check_result[:response]
 
@@ -46,13 +50,8 @@ module Bucky
             puts "  #{url} ...  [#{response.code}:OK]"
             { entity: response.entity }
           when /3[0-9]{2}/
-            fqdn = url[%r{^(https?:\/\/([a-zA-Z0-9\-_.]+))}]
-            redirect_url = response['location']
-            # Add fqdn if location doesn't include fqdn
-            redirect_url = fqdn << redirect_url unless redirect_url.include?('http')
-            puts "  #{url} ... redirect to #{redirect_url} [#{response.code}:RD]"
-            http_status_check_args = { url: redirect_url, device: device, link_check_max_times: link_check_max_times, url_log: url_log, redirect_count: redirect_count + 1, redirect_url_list: redirect_url_list }
-            http_status_check(http_status_check_args)
+            http_status_check_args = { url: url, device: device, link_check_max_times: link_check_max_times, url_log: url_log, redirect_count: redirect_count + 1, redirect_url_list: redirect_url_list }
+            redirect_and_http_status_check(response, http_status_check_args)
           when /(4|5)[0-9]{2}/
             url_log[url][:error_message] = "[Status Error] http status returned #{response.code}.\ncheck this url: #{redirect_url_list.join(' -> ')}"
             puts "  #{url} ...  [#{response.code}:NG]"
@@ -82,12 +81,12 @@ module Bucky
           # Check base url
           http_status_check_args = { url: url, device: device, link_check_max_times: link_check_max_times, url_log: url_log, redirect_count: 0, redirect_url_list: [] }
           base_response = http_status_check(http_status_check_args)
-          assert_nil(base_response[:error_message], "Response of base URL is incorrect.\n#{base_response[:error_message]}")
+          raise Test::Unit::AssertionFailedError, "Response of base URL is incorrect.\n#{base_response[:error_message]}" unless base_response[:error_message].nil?
 
           # Collect links
           links_args = { base_url: base_url, base_fqdn: base_fqdn, url_reg: url_reg, only_same_fqdn: only_same_fqdn, entity: base_response[:entity] }
           links = make_target_links(links_args)
-          links = exclude(links, exclude_urls) unless exclude_urls.nil?
+          links = exclude(links, exclude_urls)
 
           errors = []
           Parallel.each(links.uniq, in_threads: Bucky::Utils::Config.instance[:linkstatus_thread_num]) do |link|
@@ -96,7 +95,7 @@ module Bucky
             link_response = http_status_check(http_status_check_args)
             errors << link_response[:error_message] if link_response[:error_message]
           end
-          assert_empty(errors, errors.join("\n"))
+          raise Test::Unit::AssertionFailedError, errors.join("\n") unless errors.empty?
         end
 
         def make_target_links(args)
@@ -109,7 +108,7 @@ module Bucky
           doc = Nokogiri::HTML.parse(entity)
           links = []
           doc.xpath('//a').each do |node|
-            href = node.attr('href')
+            href = node.attr('href')&.split(' ')&.first # Patch for nokogiri's bug
             next if exclude_href?(href)
 
             # Add fqdn if href doesn't include fqdn
@@ -128,6 +127,8 @@ module Bucky
 
         # Exclude non test target url
         def exclude(links, exclude_urls)
+          return links if exclude_urls.nil?
+
           excluded_links = links - exclude_urls
 
           # Exclude url if it has "*" in the last of it
@@ -178,6 +179,16 @@ module Bucky
           href.insert(0, '/') unless href.match(%r{^/|^#})
           base_url + href
         end
+
+        def redirect_and_http_status_check(response, http_status_check_args)
+          fqdn = http_status_check_args[:url][%r{^(https?:\/\/([a-zA-Z0-9\-_.]+))}]
+          redirect_url = response['location']
+          # Add fqdn if location doesn't include fqdn
+          redirect_url = fqdn << redirect_url unless redirect_url.include?('http')
+          puts "  #{http_status_check_args[:url]} ... redirect to #{redirect_url} [#{response.code}:RD]"
+          http_status_check_args[:url] = redirect_url
+          http_status_check(http_status_check_args)
+        end
       end
     end
   end

data/lib/bucky/version.rb

@@ -2,6 +2,6 @@
 
 module Bucky
   module Version
-    VERSION = '0.10.4'
+    VERSION = '0.10.9'
   end
 end

data/system_testing/test_bucky_project/config/e2e_config.yml

@@ -1,7 +1,7 @@
 :selenium_ip: 'docker_host_ip'  # Default selenium ip. please set ip or 'docker_host_ip'. ip route | awk 'NR==1 {print $3}'
 :selenium_port: '4444'     # Default selenium port
 :browser: :chrome          # Only chrome
-:headless: false
+:headless: true
 :e2e_parallel_num: 1
 :sp_device_name: :iphone
 :tablet_device_name: :ipad

data/system_testing/test_bucky_project/services/service_a/pc/pageobject/index.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bucky/test_equipment/pageobject/base_pageobject'
+require '/bucky-core/lib/bucky/test_equipment/pageobject/base_pageobject'
 module Services
   module ServiceA
     module Pc

data/system_testing/test_bucky_project/services/service_a/pc/verifications/index.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bucky/test_equipment/verifications/e2e_verification'
+require '/bucky-core/lib/bucky/test_equipment/verifications/e2e_verification'
 module Services
   module ServiceA
     module Pc

data/system_testing/test_bucky_project/services/service_a/sp/pageobject/index.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bucky/test_equipment/pageobject/base_pageobject'
+require '/bucky-core/lib/bucky/test_equipment/pageobject/base_pageobject'
 
 module Services
   module ServiceA

data/system_testing/test_bucky_project/services/service_a/tablet/pageobject/index.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bucky/test_equipment/pageobject/base_pageobject'
+require '/bucky-core/lib/bucky/test_equipment/pageobject/base_pageobject'
 
 module Services
   module ServiceA

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucky-core
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.9
 platform: ruby
 authors:
 - NaotoKishino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -147,14 +147,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: 0.68.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: 0.68.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
@@ -203,28 +217,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -453,15 +467,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.2
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: System testing framework for web application.