geordi 5.4.0 → 6.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87cda39f50721b8821dc5042de4a4ead24b4f8a27d5601bcb1742aa5f1a7cd00
-  data.tar.gz: baf33c3c575963062318374024cfae1071dd1002aaebbdd1c353cc7dc8c4c0c0
+  metadata.gz: eee4c378b0fe08b20405c74876813d2e23eda1e09c92dae4a19146af9f414a2d
+  data.tar.gz: 48bfb8c877fedf002b46aa1f09ea7dde284c9b1358f1c8f1f9c39a0bc3381c03
 SHA512:
-  metadata.gz: 0a66597a85f305bf90bf01ec56f0141ad4c3a7fcbd4d21032e8a7f64b2b5fece841e37084c8f783d7f8b9269e484d4cd7d6b35523435b032d67e472125c14043
-  data.tar.gz: 74954d6cf80dc9dea5b3f8d233fa2f2c2cb0c65fb229c385b96cb202f667dfdab14a1fd32212f3a168658cbeacbe4a279300a6a6fbcb9eee44f91a85b5da241f
+  metadata.gz: e24c228acd4170e540b76accc1708bf7df44f3650052c200abfdb2f297770e7660f017a176bd0edbc74202d08c1c4df9d3c05289d91c06501ebcb7f32d28839f
+  data.tar.gz: e817b989c4254f3482a888418fef3ca57f493901cce611ab970faaaf8db6ff259ea67f7417ffb6b964bb6f1063e926afe0503ace94c1ce497e9c92c494c41ec0

data/.github/workflows/test.yml

@@ -25,6 +25,8 @@ jobs:
           gemfile: Gemfile
         - ruby: 2.7.2
           gemfile: Gemfile
+        - ruby: 3.0.0
+          gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
@@ -33,16 +35,14 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
-    - name: Install vncserver
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y tightvncserver
-        # Fake required password for vncserver
-        mkdir ~/.vnc && touch ~/.vnc/passwd && chmod 700 ~/.vnc/passwd
     - name: Bundle
       run: |
         gem install bundler:1.17.3
         bundle install --no-deployment
+    - name: Install VNC viewer
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xtightvncviewer
     - name: Run tests
       run: bundle exec rake
     

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/CHANGELOG.md

@@ -3,13 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-
 ## Unreleased
 
 ### Compatible changes
+* Removed support for serial execution of scenarios tagged with @solo.
 
 ### Breaking changes
 
+## 6.0.0 2021-04-06
+
+### Compatible changes
+* `geordi commit` will continue even if one of the given projects is inaccessible. It will only fail if no stories could be found at all.
+
+### Breaking changes
+* Removed VNC test browser support for integration tests.
+  * Please use a headless Chrome setup <https://makandracards.com/makandra/492109-capybara-running-tests-with-headless-chrome>. 
+  * You might also want to get rid of your local VNC server `sudo apt remove tightvncserver`.
 
 ## 5.4.0 2021-02-01
 

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem 'aruba', '< 1' # Drops support for Ruby 2.2-
 gem 'rake', '< 13' # Drops support for Ruby 2.1
-gem 'rspec-mocks'
+gem 'rspec'
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (5.3.0)
+    geordi (6.0.0)
       thor (~> 1)
 
 GEM
@@ -62,10 +62,15 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.9)
+      nokogiri (~> 1)
+      rake
+    mini_portile2 (2.4.0)
     multi_json (1.15.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
     parallel_tests (2.32.0)
       parallel
@@ -78,10 +83,16 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
+    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.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
@@ -115,7 +126,7 @@ DEPENDENCIES
   parallel_tests
   pry
   rake (< 13)
-  rspec-mocks
+  rspec
   tracker_api
 
 BUNDLED WITH

data/README.md

@@ -90,12 +90,8 @@ Run Cucumber features.
 
 Example: `geordi cucumber features/authentication_feature:3`
 
-Runs Cucumber with `bundle exec`, using parallel tests, with a VNC session
-holding Selenium test browsers, support for using a dedicated testing browser
-and beta support for re-running failed scenarios.
-
-- *@solo:* Generally, features are run in parallel. However, scenarios tagged
-with @solo are excluded from the parallel run and executed sequentially instead.
+Runs Cucumber with `bundle exec`, using parallel tests and with support for re-running
+failed scenarios.
 
 - *Debugging:* In some cases, the dot-printing Cucumber formatter swallows
 errors. In case a feature fails without an error message, try running it with
@@ -105,10 +101,6 @@ errors. In case a feature fails without an error message, try running it with
 e.g. `--format=pretty`. Make sure to connect option and value with an equals
 sign, i.e. have each option a contiguous string.
 
-- *VNC:* By default, test browsers will run in a VNC session. When using a
-headless test browser anyway, you can disable VNC by setting `use_vnc: false`
-in `.geordi.yml` in the project root.
-
 - In order to limit processes in a parallel run, you can set an environment
   variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi cucumber`
 
@@ -188,6 +180,7 @@ There are three subcommands:
 
 - `geordi docker vnc`
   Opens a VNC viewer to connect to the VNC server in the container.
+  Append `--setup` to be guided through the setup of VNC viewer.
 
 
 ### `geordi drop-databases`
@@ -235,19 +228,6 @@ Loading a dump into one of multiple local databases is not supported yet.
 - `-d, [--database=NAME]`: Database name, if there are multiple databases
 
 
-### `geordi firefox COMMAND`
-Run a command with VNC and test browser set up (alias: chrome).
-
-Example: `geordi firefox b cucumber` or `geordi firefox --setup 24.0`
-
-Useful when you need Firefox for Selenium or the VNC set up, but can't use the
-`geordi cucumber` command. This command is aliased `chrome` for users running
-Selenium in Chrome.
-
-**Options**
-- `[--setup=FIREFOX_VERSION]`: Install a special test runner Firefox with the given version
-
-
 ### `geordi help [COMMAND]`
 Describe available commands or one specific command.
 
@@ -389,18 +369,6 @@ Performs: `git pull`, `bundle install` (if necessary) and migrates (if applicabl
 ### `geordi version`
 Print the current version of geordi.
 
-
-### `geordi vnc`
-Show the hidden VNC window.
-
-Example: `geordi vnc` or `geordi vnc --setup`
-
-Launch a VNC session to the hidden screen where `geordi cucumber` runs Selenium
-tests.
-
-**Options**
-- `[--setup], [--no-setup]`: Guide through the setup of VNC
-
 b
 ---
 
@@ -424,13 +392,6 @@ Stores a timestamped database dump for the given Rails environment in `~/dumps`:
 - `--compress`: After dumping, run gzip to compress the dump in place
 
 
-launchy_browser
----------------
-
-Used by the `geordi cucumber` command. Makes launchy open pages in the user's
-browser, as opposed to opening it within the VNC window.
-
-
 Contributing
 ============
 

data/geordi.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor', '~> 1'
 
-  #spec.post_install_message = <<-ATTENTION
-  #ATTENTION
+  spec.post_install_message = <<-ATTENTION
+  Support for sequential running of integration tests tagged with @solo has been dropped.
+  ATTENTION
 end

data/lib/geordi/chromedriver_updater.rb

@@ -10,7 +10,7 @@ module Geordi
       chromedriver_version = determine_chromedriver_version
 
       if skip_update?(chrome_version, chromedriver_version)
-        Interaction.note("No update required, you are using for both executables the same version #{chrome_version}!") unless options[:quiet_if_matching]
+        Interaction.success "No update required: both Chrome and chromedriver are on v#{chrome_version}!" unless options[:quiet_if_matching]
       else
         chromedriver_zip = download_chromedriver(chrome_version)
         unzip(chromedriver_zip, File.expand_path('~/bin'))
@@ -18,7 +18,7 @@ module Geordi
         chromedriver_zip.unlink
 
         # We need to determine the version again, as it could be nil in case no chromedriver was installed before
-        Interaction.note "Chromedriver updated to version #{determine_chromedriver_version}"
+        Interaction.success "Chromedriver updated to v#{determine_chromedriver_version}."
       end
     end
 
@@ -31,7 +31,7 @@ module Geordi
       end
 
       if !status.success? || chrome_version.nil?
-        Interaction.fail('Could not determine the current Google Chrome version')
+        Interaction.fail('Could not determine the version of Google Chrome.')
       else
         chrome_version.to_i
       end
@@ -46,7 +46,7 @@ module Geordi
       end
 
       if !status.success? || chromedriver_version.nil?
-        Interaction.fail('Could not determine the current chromedriver version')
+        Interaction.fail('Could not determine the version of chromedriver.')
       else
         chromedriver_version.to_i
       end
@@ -68,7 +68,7 @@ module Geordi
 
         file
       else
-        Interaction.fail("Could not download chromedriver version #{latest_version}")
+        Interaction.fail("Could not download chromedriver v#{latest_version}.")
       end
     end
 
@@ -79,7 +79,7 @@ module Geordi
       if response.is_a?(Net::HTTPSuccess)
         response.body.to_s
       else
-        Interaction.fail("Could not find the latest version for Google Chrome version #{chrome_version}")
+        Interaction.fail("Could not download the chromedriver v#{chrome_version}.")
       end
     end
 
@@ -87,7 +87,7 @@ module Geordi
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
-        Interaction.fail("Could not unzip #{zip.path}")
+        Interaction.fail("Could not unzip #{zip.path}.")
       end
     end
   end

data/lib/geordi/cli.rb

@@ -15,12 +15,12 @@ module Geordi
       class_eval File.read(file), file
     end
 
-    private
-
-    # fix weird implementation of #invoke
-    def invoke_geordi(name, *args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      invoke(name, args, options)
+    no_commands do
+      # fix weird implementation of #invoke
+      def invoke_geordi(name, *args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        invoke(name, args, options)
+      end
     end
 
   end

data/lib/geordi/commands/cucumber.rb

@@ -2,12 +2,8 @@ desc 'cucumber [FILES and OPTIONS]', 'Run Cucumber features'
 long_desc <<-LONGDESC
 Example: `geordi cucumber features/authentication_feature:3`
 
-Runs Cucumber with `bundle exec`, using parallel tests, with a VNC session
-holding Selenium test browsers, support for using a dedicated testing browser
-and beta support for re-running failed scenarios.
-
-- *@solo:* Generally, features are run in parallel. However, scenarios tagged
-with @solo are excluded from the parallel run and executed sequentially instead.
+Runs Cucumber with `bundle exec`, using parallel tests and with support for re-running
+failed scenarios.
 
 - *Debugging:* In some cases, the dot-printing Cucumber formatter swallows
 errors. In case a feature fails without an error message, try running it with
@@ -17,10 +13,6 @@ errors. In case a feature fails without an error message, try running it with
 e.g. `--format=pretty`. Make sure to connect option and value with an equals
 sign, i.e. have each option a contiguous string.
 
-- *VNC:* By default, test browsers will run in a VNC session. When using a
-headless test browser anyway, you can disable VNC by setting `use_vnc: false`
-in `.geordi.yml` in the project root.
-
 - In order to limit processes in a parallel run, you can set an environment
   variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi cucumber`
 LONGDESC
@@ -67,28 +59,6 @@ def cucumber(*args)
     cmd_opts, files = args.partition { |f| f.start_with? '-' }
     cmd_opts << '--format' << 'pretty' << '--backtrace' if options.debug
 
-    # Serial run of @solo scenarios ############################################
-    if files.any? { |f| f.include? ':' }
-      Interaction.note '@solo run skipped when called with line numbers' if options.verbose
-    else
-      solo_files = if files.empty?
-        'features' # Proper grepping
-      else
-        files.join(' ')
-      end
-
-      solo_tag_usages = `grep -r '@solo' #{solo_files}`.split("\n")
-
-      if solo_tag_usages.any?
-        solo_cmd_opts = cmd_opts.dup
-        solo_cmd_opts << '--tags' << '@solo'
-
-        Interaction.announce 'Running @solo features'
-        solo_success = Geordi::Cucumber.new.run files, solo_cmd_opts, verbose: options.verbose, parallel: false
-        solo_success || Interaction.fail('Features failed.')
-      end
-    end
-
     # Parallel run of all given features + reruns ##############################
     Interaction.announce 'Running features'
     normal_run_successful = Geordi::Cucumber.new.run(files, cmd_opts, verbose: options.verbose)

data/lib/geordi/commands/delete_dumps.rb

@@ -30,7 +30,7 @@ def delete_dumps(*locations)
   deletable_dumps = dump_files.flatten.uniq.sort.select &File.method(:file?)
 
   if deletable_dumps.empty?
-    Interaction.note 'No dump files found'
+    Interaction.warn 'No dump files found.'
   else
     puts deletable_dumps
     Interaction.prompt('Delete these files?', 'n', /y|yes/) || Interaction.fail('Cancelled.')

data/lib/geordi/commands/docker.rb

@@ -12,8 +12,13 @@ class DockerCLI < Thor
   end
 
   desc 'vnc', 'Open a vnc viewer connecting to the docker container'
+  option :setup, default: false, type: :boolean, desc: 'Guide through the setup of VNC'
   def vnc
-    docker.vnc
+    if options.setup
+      docker.setup_vnc
+    else
+      docker.vnc
+    end
   end
 
   private
@@ -42,5 +47,6 @@ There are three subcommands:
 
 - `geordi docker vnc`
   Opens a VNC viewer to connect to the VNC server in the container.
+  Append `--setup` to be guided through the setup of VNC viewer.
 LONGDESC
 subcommand 'docker', DockerCLI

data/lib/geordi/commands/drop_databases.rb

@@ -47,6 +47,4 @@ def drop_databases
   cleaner = DBCleaner.new(extra_flags)
   cleaner.clean_mysql unless options.postgres_only
   cleaner.clean_postgres unless options.mysql_only
-
-  Interaction.success 'Done.'
 end

data/lib/geordi/commands/remove_executable_flags.rb

@@ -10,5 +10,6 @@ def remove_executable_flags
     Interaction.note pattern
     `find . -name "#{pattern}" -exec chmod -x {} ';'`
   end
-  puts 'Done.'
+
+  Interaction.success 'Done.'
 end

data/lib/geordi/cucumber.rb

@@ -4,67 +4,23 @@ require 'tempfile'
 # This require-style is to prevent Ruby from loading files of a different
 # version of Geordi.
 require File.expand_path('interaction', __dir__)
-require File.expand_path('firefox_for_selenium', __dir__)
 require File.expand_path('settings', __dir__)
 
 module Geordi
   class Cucumber
 
-    VNC_DISPLAY = ':17'.freeze
-    VNC_PASSWORD_FILE = File.expand_path('~/.vnc/passwd').freeze # default for "vncpasswd"
-    VNC_SERVER_DEFAULT_OPTIONS = "-localhost -nolisten tcp -geometry 1280x1024 -rfbauth #{VNC_PASSWORD_FILE}".freeze
-    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} #{ENV.fetch('GEORDI_VNC_OPTIONS', VNC_SERVER_DEFAULT_OPTIONS)}".freeze
-    VNC_VIEWER_COMMAND = "vncviewer -passwd #{VNC_PASSWORD_FILE}".freeze
-    VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER].freeze
-
     def run(files, cucumber_options, options = {})
       self.argv = files + cucumber_options.map { |option| option.split('=') }.flatten
       self.settings = Geordi::Settings.new
 
       consolidate_rerun_txt_files
       show_features_to_run
-      setup_vnc if settings.use_vnc?
 
       command = use_parallel_tests?(options) ? parallel_execution_command : serial_execution_command
       Interaction.note_cmd(command) if options[:verbose]
 
       puts # Make newline
-      system command # Util.run! would reset the Firefox PATH
-    end
-
-    def launch_vnc_viewer(source = VNC_DISPLAY)
-      fork do
-        error = capture_stderr do
-          system("#{VNC_VIEWER_COMMAND} #{source}")
-        end
-        unless $?.success?
-          if $?.exitstatus == 127
-            Interaction.fail 'VNC viewer not found. Install it with `geordi vnc --setup`.'
-          else
-            Interaction.note 'VNC viewer could not be opened:'
-            puts error
-            puts
-          end
-        end
-      end
-    end
-
-    def restore_env
-      VNC_ENV_VARIABLES.each do |variable|
-        ENV[variable] = ENV["OUTER_#{variable}"]
-      end
-    end
-
-    def setup_vnc
-      if try_and_start_vnc
-        VNC_ENV_VARIABLES.each do |variable|
-          ENV["OUTER_#{variable}"] = ENV[variable] if ENV[variable]
-        end
-        ENV['BROWSER'] = ENV['LAUNCHY_BROWSER'] = File.expand_path('../../exe/launchy_browser', __dir__)
-        ENV['DISPLAY'] = VNC_DISPLAY
-
-        Interaction.note 'Run `geordi vnc` to view the Selenium test browsers'
-      end
+      system command
     end
 
     private
@@ -76,7 +32,7 @@ module Geordi
       unless argv.include?('--format') || argv.include?('-f')
         format_args = spinner_available? ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
       end
-      [use_firefox_for_selenium, Util.binstub_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
+      [ Util.binstub_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
     end
 
     def parallel_execution_command
@@ -88,28 +44,12 @@ module Geordi
       features = find_all_features_recursively('features') if features.empty?
 
       [
-        use_firefox_for_selenium,
         'bundle exec parallel_test -t ' + type_arg,
-        %(-o '#{command_line_options.join(' ')} --tags "#{not_tag('@solo')}"'),
+        %(-o '#{command_line_options.join(' ')}'),
         "-- #{features.join(' ')}",
       ].compact.join(' ')
     end
 
-    def not_tag(name)
-      if Util.gem_major_version('cucumber') < 3
-        "~#{name}"
-      else
-        "not #{name}"
-      end
-    end
-
-    def use_firefox_for_selenium
-      path = Geordi::FirefoxForSelenium.path_from_config
-      if path
-        "PATH=#{path}:$PATH"
-      end
-    end
-
     def escape_shell_args(*args)
       args.flatten.collect do |arg|
         arg.gsub(/([\\ "])/) { |_match| "\\#{Regexp.last_match(1)}" }
@@ -117,9 +57,7 @@ module Geordi
     end
 
     def show_features_to_run
-      if command_line_options.include? '@solo'
-        Interaction.note 'All features tagged with @solo'
-      elsif command_line_options.include? 'rerun'
+      if command_line_options.include? 'rerun'
         Interaction.note 'Rerunning failed scenarios'
       elsif features_to_run.empty?
         Interaction.note 'All features in features/'
@@ -210,39 +148,5 @@ module Geordi
         features_to_run.none? { |f| f.include? ':' }
     end
 
-    def try_and_start_vnc
-      # check if vnc is already running
-      # return true if vnc_server_running?
-      error = capture_stderr do
-        system(VNC_SERVER_COMMAND)
-      end
-      case $?.exitstatus
-      when 0,
-        98 # was already running after all
-        true
-      when 127 # not installed
-        Interaction.warn 'Could not launch VNC server. Install it with `geordi vnc --setup`.'
-        false
-      else
-        Interaction.warn 'Starting VNC failed:'
-        puts error
-        puts
-        false
-      end
-    end
-
-    def capture_stderr
-      old_stderr = $stderr.dup
-      io = Tempfile.new('cuc')
-      $stderr.reopen(io)
-      yield
-      io.rewind
-      io.read
-    ensure
-      io.close
-      io.unlink
-      $stderr.reopen(old_stderr)
-    end
-
   end
 end