howitzer 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1044884bf6fe39dc63128f59f930a0d75ae80297a946d34d2464f47a30fe17fe
-  data.tar.gz: b5501960e801914414fc6569996a9cc219e601ea78dfea1dac28c7db9d582ac7
+  metadata.gz: e852d31ef96f01da8783feb0688f34901f36958feb9502a4acaf039b0222a784
+  data.tar.gz: db26af1725f61c09a8eada615759f7faf328eb31842f1037fe8c3c420b3a5f0a
 SHA512:
-  metadata.gz: 450f74b4dec7185673b2faa9138c8afb4b9568be8680f38718728105ad5893a5e1abfb1d908e759a021fcd3af13093e67775537b3a109219b065b00c30a7f293
-  data.tar.gz: 0bc01379c520937ec1bd004fffcc44b9c558ff9c1c5eea1a292067d65f5d1661f9f5aaf806c5b0183d34e46c2591fc3bd9b71a0cc8288fc7e12b56d9946478d0
+  metadata.gz: f186c042c5e2e408b447efab984d7ee29c02da4f3914ae6fc8c78fd7e0c9a07a4cbbfd4e82d09b498b66dc77bcebdde0b33413d1321bc03a45ca276184308e39
+  data.tar.gz: 87cf762790229be3a790c03958d2bd1320b91a7b4383b183ada710b85f56f77ff222fda0d4fbe629331a850a31e0f9565688beab1462406a4d460bd1d27855a4

data/CHANGELOG.md

@@ -1,8 +1,25 @@
-## [In git](https://github.com/strongqa/howitzer/compare/v2.3.0...master)
+## [2.6.0](https://github.com/strongqa/howitzer/compare/v2.5.0...v2.6.0) (2023-01-16)
 
-### New Features
 
-### Bug-fixes
+### Features
+
+* Add Docker support ([#321](https://github.com/strongqa/howitzer/issues/321)) ([d0e7bc9](https://github.com/strongqa/howitzer/commit/d0e7bc953182b13e93b74ab4b609316ece6cf956))
+* Ruby3.2 support ([#327](https://github.com/strongqa/howitzer/issues/327)) ([265acc3](https://github.com/strongqa/howitzer/commit/265acc34fb2eac9b879e097ae938e66c62a6e7f7))
+
+
+### Bug Fixes
+
+* Handle section options ([#324](https://github.com/strongqa/howitzer/issues/324)) ([b976e5b](https://github.com/strongqa/howitzer/commit/b976e5b83800fa1c0671857daba796dd8a1048f4))
+* Section method typo ([#318](https://github.com/strongqa/howitzer/issues/318)) ([984deeb](https://github.com/strongqa/howitzer/commit/984deebe817d27278b93517b3f0e1338af25128a))
+
+## [2.6.1](https://github.com/strongqa/howitzer/compare/v2.6.0...v2.6.1) (2023-02-24)
+
+
+### Bug Fixes
+
+* add missing hidden files to gem ([#335](https://github.com/strongqa/howitzer/issues/335)) ([60d0559](https://github.com/strongqa/howitzer/commit/60d0559df9e639d72eaf3428979e2fd4de04137b))
+* changed Target ruby version ([#329](https://github.com/strongqa/howitzer/issues/329)) ([911d4a7](https://github.com/strongqa/howitzer/commit/911d4a7ce7690d0d1edd2e14ae34ae0a8d5d23a7))
+* dev dependecies moved to Gemfile ([#333](https://github.com/strongqa/howitzer/issues/333)) ([ed289de](https://github.com/strongqa/howitzer/commit/ed289deada87bf18d80a5104e7b3cb774499c90f))
 
 ## [2.5.0](https://github.com/strongqa/howitzer/compare/v2.4.0...v2.5.0) (2022-08-16)
 

data/MAINTENANCE.md

@@ -0,0 +1,31 @@
+# Howitzer Maintenance
+
+This guide provides detailed instructions how to release a new Howitzer version
+
+To release a new Howitzer version:
+
+* Make sure all pull requests have been merged to master branch
+* Make sure last build is passed in [TravisCI](https://app.travis-ci.com/github/strongqa/howitzer)
+* Make sure the code is covered 100% in [Codecov](https://codecov.io/gh/strongqa/howitzer/branch/master)
+* Make sure the code is documented 100% with following command:
+```
+rake yard
+```
+* [Upgrade](https://github.com/strongqa/howitzer/wiki/Migration-to-new-version) Howitzer examples [Cucumber](https://github.com/strongqa/howitzer_example_cucumber), [Rspec](https://github.com/strongqa/howitzer_example_rspec) and [Turnip](https://github.com/strongqa/howitzer_example_turnip) to last version of code from master and make sure all builds are green
+* Bump [version](lib/howitzer/version.rb). Please note howitzer uses [semantic versioning](https://semver.org/)
+* Verify and actualize [ChangeLog](CHANGELOG.md)
+* Commit all changes and push to origin master
+* Specify credentials for Rubygems.org (once only) with following commands:
+```bash
+curl https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+```
+* Release Gem with following command:
+```bash
+rake release
+```
+* Verify successful release on [Rubygems](https://rubygems.org/gems/howitzer)
+* Force API documentation indexing for the new version on [Rubygems](https://rubygems.org/gems/howitzer)
+* Update new link to documentation on [web site](https://github.com/romikoops/howitzer-framework.io/tree/gh-pages) Note: The web site will be updated automatically after pushing code to Github
+* Update [Howitzer Guides](https://github.com/strongqa/docs.howitzer-framework.io/blob/gh-pages/README.md) regarding new changes
+* Notify Community (Gitter, Twitter, Google Group) about the new release

data/README.md

@@ -11,7 +11,7 @@
   <p align="center">
   <a href="https://gitter.im/strongqa/howitzer"><img src="https://badges.gitter.im/Join%20Chat.svg" /></a>
   <a href="https://rubygems.org/gems/howitzer"><img src="https://img.shields.io/gem/v/howitzer.svg" /></a>
-  <a href="https://app.travis-ci.com/github/strongqa/howitzer"><img src="https://app.travis-ci.com/strongqa/howitzer.svg?branch=master" /></a>
+  <a href="https://github.com/strongqa/howitzer/actions/workflows/ci.yml"><img src="https://github.com/strongqa/howitzer/actions/workflows/ci.yml/badge.svg" /></a>
   <a href="https://codeclimate.com/github/strongqa/howitzer"><img src="https://codeclimate.com/github/strongqa/howitzer.png" /></a>
   <a href="https://codecov.io/gh/strongqa/howitzer">
     <img src="https://codecov.io/gh/strongqa/howitzer/branch/master/graph/badge.svg?token=vB8DYQtmjA"/>

data/Rakefile

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
+require 'rake'
+require 'yard'
+require 'stringio'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+require 'rubocop/rake_task'
+
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec) { |_spec| nil }
+
+Cucumber::Rake::Task.new(:cucumber, 'Run all cucumber features') do |t|
+  t.fork = false
+  t.cucumber_opts = %w[--publish-quiet]
+end
+
+RuboCop::RakeTask.new
+
+YARD::Rake::YardocTask.new { |_t| nil }
+
+namespace :yard do
+  desc 'Validate yard coverage'
+  task :validate do
+    log = StringIO.new
+    YARD::Logger.instance(log)
+    doc = YARD::CLI::Yardoc.new
+    doc.use_document_file = false
+    doc.use_yardopts_file = false
+    doc.generate = false
+    doc.run('stats --list-undoc')
+    output = log.string
+    puts output
+    exit(1) unless output.include?('100.00% documented')
+  end
+end
+
+task default: %i[rubocop yard:validate spec cucumber]

data/bin/howitzer

@@ -31,21 +31,21 @@ module HowitzerCli
         Dir.mkdir(path_to_dir)
         puts "      #{ColorizedString.new('Created').light_green} './#{args.first}' folder"
         Dir.chdir(path_to_dir)
-        Howitzer::ConfigGenerator.new(options)
-        Howitzer::WebGenerator.new(options)
-        Howitzer::TasksGenerator.new(options)
-        Howitzer::EmailsGenerator.new(options)
-        Howitzer::RootGenerator.new(options)
-        Howitzer::PrerequisitesGenerator.new(options)
+        Howitzer::ConfigGenerator.new(options, args)
+        Howitzer::WebGenerator.new(options, args)
+        Howitzer::TasksGenerator.new(options, args)
+        Howitzer::EmailsGenerator.new(options, args)
+        Howitzer::RootGenerator.new(options, args)
+        Howitzer::PrerequisitesGenerator.new(options, args)
         if options[:cucumber]
-          Howitzer::CucumberGenerator.new(options)
+          Howitzer::CucumberGenerator.new(options, args)
         elsif options[:rspec]
-          Howitzer::RspecGenerator.new(options)
+          Howitzer::RspecGenerator.new(options, args)
         elsif options['turnip']
-          Howitzer::TurnipGenerator.new(options)
+          Howitzer::TurnipGenerator.new(options, args)
         end
         puts ColorizedString.new('[WARN] Extra parameters were skipped').yellow if args.size > 1
-      elsif args.size.zero?
+      elsif args.empty?
         exit_now!(ColorizedString.new('Please specify <PROJECT NAME>').red, 64)
       end
     end

data/generators/base_generator.rb

@@ -54,8 +54,8 @@ module Howitzer
       end
     end
 
-    def initialize(_options)
-      super()
+    def initialize
+      super
 
       manifest.each do |type, list|
         case type
@@ -72,6 +72,12 @@ module Howitzer
       []
     end
 
+    def template_context
+      data = options
+      data = options.merge(project_name: project_name) unless project_name.nil?
+      OpenStruct.new(data) # rubocop:disable Style/OpenStructUse
+    end
+
     protected
 
     def copy_files(list)
@@ -90,7 +96,7 @@ module Howitzer
         else
           write_template(destination_path, source_path)
           puts_info "#{ColorizedString.new('Added').light_green} template '#{data[:source]}' with " \
-                    "params '#{@options}' to destination '#{data[:destination]}'"
+                    "params '#{template_context.to_h}' to destination '#{data[:destination]}'"
         end
       end
     end
@@ -118,8 +124,10 @@ module Howitzer
     end
 
     def write_template(dest_path, source_path)
-      File.write(dest_path, ERB.new(File.read(source_path), trim_mode: '-')
-         .result(OpenStruct.new(@options).instance_eval { binding })) # rubocop:disable Style/OpenStructUse
+      File.write(
+        dest_path,
+        ERB.new(File.read(source_path), trim_mode: '-').result(template_context.instance_eval { binding })
+      )
     end
 
     private
@@ -177,14 +185,16 @@ module Howitzer
 
   # Parent class for all generators
   class BaseGenerator
-    attr_reader :options
+    attr_reader :options, :args, :project_name
 
     include Outputable
     include Copyable
 
-    def initialize(options = {})
+    def initialize(options = {}, args = [])
       @options = options.symbolize_keys
-      super
+      @args = args
+      @project_name = args.first
+      super()
     end
   end
 end

data/generators/root/root_generator.rb

@@ -7,12 +7,16 @@ module Howitzer
       { files:
         [
           { source: '.gitignore', destination: '.gitignore' },
+          { source: '.dockerignore', destination: '.dockerignore' },
+          { source: 'Dockerfile', destination: 'Dockerfile' },
           { source: 'Rakefile', destination: 'Rakefile' }
         ],
         templates:
         [
           { source: '.rubocop.yml.erb', destination: '.rubocop.yml' },
-          { source: 'Gemfile.erb', destination: 'Gemfile' }
+          { source: 'docker-compose.yml.erb', destination: 'docker-compose.yml' },
+          { source: 'Gemfile.erb', destination: 'Gemfile' },
+          { source: 'README.md.erb', destination: 'README.md' }
         ] }
     end
 

data/generators/root/templates/.dockerignore

@@ -0,0 +1,13 @@
+.git
+.gitmodules
+.gitignore
+.idea
+log
+eylogs
+spec/results
+spec/sandbox
+tmp
+.DS_STORE
+.DS_Store
+.travis.yml
+.circleci

data/generators/root/templates/.gitignore

@@ -0,0 +1,21 @@
+.idea/
+custom.yml
+bin/
+log/
+eylogs/
+spec/results/
+spec/sandbox/
+tmp/
+*.swp
+*.orig
+.rakeTasks
+.bundle
+.DS_STORE
+.DS_Store
+*.xml
+*.log
+*.pem
+build-number.txt
+sauce_connect.log*
+*.*~
+capybara-*.html

data/generators/root/templates/.rubocop.yml.erb

@@ -0,0 +1,71 @@
+# See full list of defaults here: https://github.com/bbatsov/rubocop/blob/master/config/default.yml
+# To see all cops used see here: https://github.com/bbatsov/rubocop/blob/master/config/enabled.yml
+<% if rspec || turnip -%>
+require: rubocop-rspec
+<% end -%>
+
+AllCops:
+  DisplayCopNames: true
+  NewCops: enable
+  TargetRubyVersion: 3
+
+Layout/CaseIndentation:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 120
+<% if cucumber -%>
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+<% end -%>
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Max: 150
+
+Style/CaseEquality:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/EmptyElse:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+<% if turnip -%>
+
+Style/MixinGrouping:
+  EnforcedStyle: separated
+  Exclude:
+    - '**/*_steps.rb'
+<% end -%>
+<% if cucumber || turnip -%>
+
+Style/SymbolProc:
+  Exclude:
+<% if cucumber -%>
+    - 'features/step_definitions/**/*.rb'
+<%- end -%>
+<% if turnip -%>
+    - 'spec/steps/**/*.rb'
+<%- end -%>
+<% end -%>
+<% if rspec || turnip -%>
+
+RSpec/Capybara/FeatureMethods:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 40
+
+RSpec/MultipleExpectations:
+  Max: 8
+<% end -%>

data/generators/root/templates/Dockerfile

@@ -0,0 +1,34 @@
+FROM ruby:alpine
+
+ENV CHROME_BIN=/usr/bin/chromium-browser \
+    CHROME_PATH=/usr/lib/chromium/ \
+    SEXY_SETTINGS_DELIMITER=";" \
+    CHROME_ARGS="window-size=1920x1080, disable-gpu, no-sandbox, disable-dev-shm-usage, disable-software-rasterizer"
+
+RUN apk update && apk upgrade --no-cache --available \
+    && apk add --no-cache \
+      chromium firefox \
+      chromium-chromedriver \
+      ttf-freefont \
+      font-noto-emoji \
+      build-base bash \
+      curl \
+      git \
+      less dbus \
+    && apk add --no-cache \
+      --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing font-wqy-zenhei \
+    && wget https://github.com/mozilla/geckodriver/releases/download/v0.31.0/geckodriver-v0.31.0-linux64.tar.gz \
+    && tar -zxf geckodriver-v0.31.0-linux64.tar.gz -C /usr/bin \
+    && dbus-daemon --system
+
+RUN adduser -D howitzer
+USER howitzer
+
+WORKDIR /home/howitzer
+
+COPY --chown=howitzer Gemfile Gemfile.lock /home/howitzer/
+RUN bundle config --global && bundle install --jobs=3 --retry=3
+
+COPY --chown=howitzer . ./
+
+ENTRYPOINT ["sleep", "infinity"]

data/generators/root/templates/README.md.erb

@@ -0,0 +1,33 @@
+# <%= project_name %>
+
+## Run tests in Docker
+
+### Build an image
+
+`docker build -t <%= project_name %> .`
+
+### Run a container
+
+`docker run -d --name <%= project_name %>_container <%= project_name %>
+
+### Connect to the container
+
+`docker exec -it <%= project_name %>_container /bin/bash`
+
+### Run tests in the container
+
+`SEXY_SETTINGS="driver=headless_chrome; headless_chrome_flags=$CHROME_ARGS" bundle exec rake`
+
+or
+
+`SEXY_SETTINGS="driver=headless_firefox" bundle exec rake`
+
+## Run tests via docker compose
+
+### Initialize build, and run a container in detached mode
+
+`docker-compose -f docker-compose.yml up -d`
+
+### Connect to the container
+
+`docker compose exec -it <%= project_name %>  /bin/bash`

data/generators/root/templates/docker-compose.yml.erb

@@ -0,0 +1,9 @@
+version: '1.0'
+
+services:
+  <%= project_name %>:
+    build:
+      context: "."
+      dockerfile: Dockerfile
+    volumes:
+      - '.:/home/howitzer/:cached'

data/generators/turnip/templates/.rspec

@@ -0,0 +1 @@
+-r turnip/rspec

data/howitzer.gemspec

@@ -0,0 +1,48 @@
+require File.expand_path('lib/howitzer/version', __dir__)
+
+Gem::Specification.new do |gem|
+  gem.author        = 'Roman Parashchenko'
+  gem.email         = 'howitzer@strongqa.com'
+  gem.description   = 'Howitzer uses the best practices and design patterns allowing to generate a test project in ' \
+                      'less than 5 minutes. It has out-of-the-box configurations for parallel cross-browser testing ' \
+                      'in the cloud.'
+  gem.summary       = 'Ruby based framework for acceptance testing'
+  gem.homepage      = 'https://howitzer-framework.io/'
+  gem.metadata = {
+    'bug_tracker_uri' => 'https://github.com/strongqa/howitzer/issues',
+    'changelog_uri' => 'https://github.com/strongqa/howitzer/blob/master/CHANGELOG.md',
+    'documentation_uri' => "https://www.rubydoc.info/gems/howitzer/#{Howitzer::VERSION}",
+    'source_code_uri' => 'https://github.com/strongqa/howitzer',
+    'rubygems_mfa_required' => 'false'
+  }
+  gem.license = 'MIT'
+  gem.files = Dir.glob('{bin,generators,lib}/**/*', File::FNM_DOTMATCH) +
+              %w[
+                .yardopts
+                CHANGELOG.md
+                CONTRIBUTING.md
+                howitzer.gemspec
+                LICENSE
+                MAINTENANCE.md
+                Rakefile
+                README.md
+              ]
+  gem.executables   = ['howitzer']
+  gem.name          = 'howitzer'
+  gem.require_path  = 'lib'
+  gem.version       = Howitzer::VERSION
+  gem.required_ruby_version = '>= 2.7.7'
+
+  gem.add_runtime_dependency 'activesupport', ['>= 5', '< 8']
+  gem.add_runtime_dependency 'capybara', '< 4.0'
+  gem.add_runtime_dependency 'colorize'
+  gem.add_runtime_dependency 'gli'
+  gem.add_runtime_dependency 'launchy'
+  gem.add_runtime_dependency 'log4r', '~>1.1.10'
+  gem.add_runtime_dependency 'nokogiri', '~> 1.6' if gem.platform.to_s =~ /mswin|mingw/
+  gem.add_runtime_dependency 'rake'
+  gem.add_runtime_dependency 'rspec', '~>3.2'
+  gem.add_runtime_dependency 'rspec-wait'
+  gem.add_runtime_dependency 'selenium-webdriver', '>= 3.4.1'
+  gem.add_runtime_dependency 'sexy_settings'
+end

data/lib/howitzer/utils/argument_convertable.rb

@@ -0,0 +1,54 @@
+module Howitzer
+  module Utils
+    # This module mixes in private utils methods for section and element dsl
+    module ArgumentConvertable
+      private
+
+      def convert_arguments(args, options, block_args, block_options)
+        conv_args = args.map { |el| el.is_a?(Proc) ? proc_to_selector(el, block_args, block_options) : el }
+        args_options = pop_options_from_array(conv_args)
+        block_args_options = pop_options_from_array(block_args)
+        conv_options = [args_options, options, block_args_options, block_options].map do |el|
+          el.transform_keys(&:to_sym)
+        end.reduce(&:merge).except(:lambda_args)
+        [conv_args, conv_options]
+      end
+
+      def proc_to_selector(proc, block_args, block_options)
+        lambda_args = extract_lambda_args(block_args, block_options)
+        if lambda_args
+          if lambda_args[:keyword_args].present?
+            proc.call(*lambda_args[:args], **lambda_args[:keyword_args])
+          else
+            proc.call(*lambda_args[:args])
+          end
+        else
+          puts "WARNING! Passing lambda arguments with element options is deprecated.\n" \
+               "Please use 'lambda_args' method, for example: foo_element(lambda_args(title: 'Example'), wait: 10)"
+          proc.call(*block_args.shift(proc.arity))
+        end
+      end
+
+      def extract_lambda_args(block_args, block_options)
+        (block_args.first.is_a?(Hash) && block_args.first[:lambda_args]) || block_options[:lambda_args]
+      end
+
+      def pop_options_from_array(value)
+        if value.last.is_a?(Hash) && !value.last.key?(:lambda_args)
+          value.pop
+        else
+          {}
+        end
+      end
+
+      def lambda_args(*args, **keyword_args)
+        {
+          lambda_args: {
+            args: args,
+            keyword_args: keyword_args
+          }
+        }
+      end
+    end
+  end
+end

data/lib/howitzer/utils.rb

@@ -8,4 +8,5 @@ module Howitzer
   end
 end
 
+require 'howitzer/utils/argument_convertable'
 require 'howitzer/utils/string_extensions'

data/lib/howitzer/version.rb

@@ -1,4 +1,4 @@
 # This module holds howitzer version
 module Howitzer
-  VERSION = '2.5.0'.freeze # :nodoc:
+  VERSION = '2.6.1'.freeze # :nodoc:
 end

data/lib/howitzer/web/element_dsl.rb

@@ -3,67 +3,16 @@ module Howitzer
   module Web
     # This module combines element dsl methods
     module ElementDsl
-      # This module holds element helper methods
-      module Helpers
-        private
-
-        def lambda_args(*args, **keyword_args)
-          {
-            lambda_args: {
-              args: args,
-              keyword_args: keyword_args
-            }
-          }
-        end
-      end
-
       include CapybaraContextHolder
-      include Helpers
+      include Howitzer::Utils::ArgumentConvertable
 
       def self.included(base) # :nodoc:
         base.extend(ClassMethods)
       end
 
-      def convert_arguments(args, options, block_args, block_options)
-        conv_args = args.map { |el| el.is_a?(Proc) ? proc_to_selector(el, block_args, block_options) : el }
-        args_options = pop_options_from_array(conv_args)
-        block_args_options = pop_options_from_array(block_args)
-        conv_options = [args_options, options, block_args_options, block_options].map do |el|
-          el.transform_keys(&:to_sym)
-        end.reduce(&:merge).except(:lambda_args)
-        [conv_args, conv_options]
-      end
-
-      def proc_to_selector(proc, block_args, block_options)
-        lambda_args = extract_lambda_args(block_args, block_options)
-        if lambda_args
-          if lambda_args[:keyword_args].present?
-            proc.call(*lambda_args[:args], **lambda_args[:keyword_args])
-          else
-            proc.call(*lambda_args[:args])
-          end
-        else
-          puts "WARNING! Passing lambda arguments with element options is deprecated.\n" \
-               "Please use 'lambda_args' method, for example: foo_element(lambda_args(title: 'Example'), wait: 10)"
-          proc.call(*block_args.shift(proc.arity))
-        end
-      end
-
-      def extract_lambda_args(block_args, block_options)
-        (block_args.first.is_a?(Hash) && block_args.first[:lambda_args]) || block_options[:lambda_args]
-      end
-
-      def pop_options_from_array(value)
-        if value.last.is_a?(Hash) && !value.last.key?(:lambda_args)
-          value.pop
-        else
-          {}
-        end
-      end
-
       # This module holds element dsl methods
       module ClassMethods
-        include Helpers
+        include Howitzer::Utils::ArgumentConvertable
 
         protected
 
@@ -172,7 +121,6 @@ module Howitzer
             else
               capybara_context.find(*conv_args)
             end
-            return nil
           end
           private "wait_for_#{name}_element"
         end

data/lib/howitzer/web/page_dsl.rb

@@ -50,7 +50,7 @@ module Howitzer
         private
 
         def eval_in_out_context(*args, **options, &block)
-          return nil if args.size.zero?
+          return nil if args.empty?
 
           name = args.shift
           return get_outer_instance_variable(name) if name.to_s.start_with?('@')

data/lib/howitzer/web/section_dsl.rb

@@ -4,6 +4,7 @@ module Howitzer
     # This module combines section dsl methods
     module SectionDsl
       include CapybaraContextHolder
+      include Howitzer::Utils::ArgumentConvertable
 
       def self.included(base) # :nodoc:
         base.extend(ClassMethods)
@@ -11,6 +12,7 @@ module Howitzer
 
       # This module holds section dsl class methods
       module ClassMethods
+        include Howitzer::Utils::ArgumentConvertable
         # This class is for private usage only
         class SectionScope
           attr_accessor :section_class
@@ -61,9 +63,7 @@ module Howitzer
           # @raise [ArgumentError] when finder arguments were not specified
 
           def finder_options
-            @options if @args.present? # it is ok to have blank options, so we rely here on the argments
-
-            @finder_options ||= (section_class.default_finder_options || {})
+            @options.presence || section_class.default_finder_options || {}
           end
         end
 
@@ -135,45 +135,45 @@ module Howitzer
         private
 
         def define_section_method(klass, name, *args, **options)
-          define_method("#{name}_section") do |**block_options|
-            kwdargs = options.transform_keys(&:to_sym).merge(block_options.transform_keys(&:to_sym))
-            if kwdargs.present?
-              klass.new(self, capybara_context.find(*args, **kwdargs))
+          define_method("#{name}_section") do |*block_args, **block_options|
+            conv_args, conv_options = convert_arguments(args, options, block_args, block_options)
+            if conv_options.present?
+              klass.new(self, capybara_context.find(*conv_args, **conv_options))
             else
-              klass.new(self, capybara_context.find(*args))
+              klass.new(self, capybara_context.find(*conv_args))
             end
           end
         end
 
         def define_sections_method(klass, name, *args, **options)
-          define_method("#{name}_sections") do |**block_options|
-            kwdargs = options.transform_keys(&:to_sym).merge(block_options.transform_keys(&:to_sym))
-            if kwdargs.present?
-              capybara_context.all(*args, **kwdargs).map { |el| klass.new(self, el) }
+          define_method("#{name}_sections") do |*block_args, **block_options|
+            conv_args, conv_options = convert_arguments(args, options, block_args, block_options)
+            if conv_options.present?
+              capybara_context.all(*conv_args, **conv_options).map { |el| klass.new(self, el) }
             else
-              capybara_context.all(*args).map { |el| klass.new(self, el) }
+              capybara_context.all(*conv_args).map { |el| klass.new(self, el) }
             end
           end
         end
 
         def define_has_section_method(name, *args, **options)
-          define_method("has_#{name}_section?") do |**block_options|
-            kwdargs = options.transform_keys(&:to_sym).merge(block_options.transform_keys(&:to_sym))
-            if kwdargs.present?
-              capybara_context.has_selector?(*args, **kwdargs)
+          define_method("has_#{name}_section?") do |*block_args, **block_options|
+            conv_args, conv_options = convert_arguments(args, options, block_args, block_options)
+            if conv_options.present?
+              capybara_context.has_selector?(*conv_args, **conv_options)
             else
-              capybara_context.has_selector?(*args)
+              capybara_context.has_selector?(*conv_args)
             end
           end
         end
 
         def define_has_no_section_method(name, *args, **options)
-          define_method("has_no_#{name}_section?") do |**block_options|
-            kwdargs = options.transform_keys(&:to_sym).merge(block_options.transform_keys(&:to_sym))
-            if kwdargs.present?
-              capybara_context.has_no_selector?(*args, **kwdarg)
+          define_method("has_no_#{name}_section?") do |*block_args, **block_options|
+            conv_args, conv_options = convert_arguments(args, options, block_args, block_options)
+            if conv_options.present?
+              capybara_context.has_no_selector?(*conv_args, **conv_options)
             else
-              capybara_context.has_no_selector?(*args)
+              capybara_context.has_no_selector?(*conv_args)
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howitzer
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Roman Parashchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -170,62 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Howitzer uses the best practices and design patterns allowing to generate
   a test project in less than 5 minutes. It has out-of-the-box configurations for
   parallel cross-browser testing in the cloud.
@@ -239,7 +183,9 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE
+- MAINTENANCE.md
 - README.md
+- Rakefile
 - bin/howitzer
 - generators/base_generator.rb
 - generators/config/config_generator.rb
@@ -272,14 +218,21 @@ files:
 - generators/prerequisites/templates/user.rb
 - generators/prerequisites/templates/users.rb
 - generators/root/root_generator.rb
+- generators/root/templates/.dockerignore
+- generators/root/templates/.gitignore
+- generators/root/templates/.rubocop.yml.erb
+- generators/root/templates/Dockerfile
 - generators/root/templates/Gemfile.erb
+- generators/root/templates/README.md.erb
 - generators/root/templates/Rakefile
+- generators/root/templates/docker-compose.yml.erb
 - generators/rspec/rspec_generator.rb
 - generators/rspec/templates/example_spec.rb
 - generators/rspec/templates/rspec.rake
 - generators/rspec/templates/spec_helper.rb
 - generators/tasks/tasks_generator.rb
 - generators/tasks/templates/common.rake
+- generators/turnip/templates/.rspec
 - generators/turnip/templates/common_steps.rb
 - generators/turnip/templates/example.feature
 - generators/turnip/templates/spec_helper.rb
@@ -289,6 +242,7 @@ files:
 - generators/web/templates/example_page.rb
 - generators/web/templates/menu_section.rb
 - generators/web/web_generator.rb
+- howitzer.gemspec
 - lib/howitzer.rb
 - lib/howitzer/cache.rb
 - lib/howitzer/capybara_helpers.rb
@@ -322,6 +276,7 @@ files:
 - lib/howitzer/testmail_api.rb
 - lib/howitzer/testmail_api/client.rb
 - lib/howitzer/utils.rb
+- lib/howitzer/utils/argument_convertable.rb
 - lib/howitzer/utils/string_extensions.rb
 - lib/howitzer/version.rb
 - lib/howitzer/web.rb
@@ -342,7 +297,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/strongqa/howitzer/issues
   changelog_uri: https://github.com/strongqa/howitzer/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/howitzer/2.5.0
+  documentation_uri: https://www.rubydoc.info/gems/howitzer/2.6.1
   source_code_uri: https://github.com/strongqa/howitzer
   rubygems_mfa_required: 'false'
 post_install_message: 
@@ -353,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.8
+      version: 2.7.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="