watir-rspec 3.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 79391a6ea4c2729fa6b41d3c7cef576a5c3727aa
-  data.tar.gz: 81760cabffa847b04dcf5bf86349bac2598e6649
+SHA256:
+  metadata.gz: 075674ef554cab10ca8fc130f8ec96b389d6b035b23a35393c1b4097c81295b5
+  data.tar.gz: 2cbbe9711a15d4f6d4bfe5bfb53c695be1fad1c3033d38391dfedc590d64ace9
 SHA512:
-  metadata.gz: 210322d1cbbd2a1f2b3b00d7efe2096440521b6f98b87fb344bd5d4541aabebf5ab77c9a94a1cf1385bb532f438d88d5126d9c7873157a93f54f4f7980aa984f
-  data.tar.gz: 1d7f029dfe8c93997b9feda0258ef88acd6b651d96ee29c7a454013bd9b289667f2ed913e6eb15c8b4acae0f543856c935634989bdc6596ff95b8877af2a6593
+  metadata.gz: 2727b90b605d9a59f5b4410b2ac0c2bf0060296ba32db50181e354b481bd76c0881d5153562385b8f142f8edf67571e43b21311049545cdbb85c91e085ae16f4
+  data.tar.gz: 21913c5591868965b04321c5d16fc9630c033d1b3957ec242942bdd32b1bab65477ff8cd57c58947c10edc3b7b2ad73fe71e4fbe8b8708c836a3d06ae7679f7b

data/CHANGES.md

@@ -1,3 +1,14 @@
+### 5.0.0 - 2023/04/07
+
+* Fix a problem of deleting everything from current working directory when using Ruby >= 3.2.2. Closes #18.
+ 
+### 4.0.0 - 2023/03/14
+
+!!! yanked due to possible data loss when using Ruby 3.2.2 !!!
+
+* Add support for Ruby 3.x version.
+* Update Watir dependency to 7.x version.
+
 ### 3.0.0 - 2016/09/24
 
 * Add support for Watir 6.0.

data/Rakefile

@@ -1,10 +1,9 @@
-require "bundler/gem_tasks"
-
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 task :release => :spec
+require "bundler/gem_tasks"
 
 require "yard"
 YARD::Rake::YardocTask.new

data/lib/watir/rspec/cli.rb

@@ -120,8 +120,8 @@ Make sure you run the watir-rspec command within your projects' directory.]
           return @options[:rails] if @options.has_key? :rails
 
           @using_rails ||= begin
-                             File.exists?("Gemfile.lock") && File.read("Gemfile.lock") =~ /rspec-rails/ ||
-                               File.exists?("Gemfile") && File.read("Gemfile") =~ /rspec-rails/
+                             File.exist?("Gemfile.lock") && File.read("Gemfile.lock") =~ /rspec-rails/ ||
+                               File.exist?("Gemfile") && File.read("Gemfile") =~ /rspec-rails/
                            end
         end
       end

data/lib/watir/rspec/helper.rb

@@ -17,20 +17,20 @@ module Watir
       #    # notice that we're calling Watir::Browser#text_field here directly
       #    expect(text_field(id: "foo")).to be_present
       #  end
-      def method_missing(name, *args)
+      def method_missing(name, *args, &block)
         if browser.respond_to?(name)
           Helper.module_eval %Q[
-            def #{name}(*args)
-              if block_given?
-                browser.send(:#{name}, *args, &Proc.new)
+            def #{name}(*args, &block)
+              if block
+                browser.send(:#{name}, *args, &block)
               else
                 browser.send(:#{name}, *args)
               end
             end
           ]
 
-          if block_given?
-            self.send(name, *args, &Proc.new)
+          if block
+            self.send(name, *args, &block)
           else
             self.send(name, *args)
           end

data/lib/watir/rspec/html_formatter.rb

@@ -10,16 +10,17 @@ module Watir
     # * saves html of the browser upon test failure
     # * saves all files generated/downloaded during the test and shows them in the report
     class HtmlFormatter < ::RSpec::Core::Formatters::HtmlFormatter
-
       ::RSpec::Core::Formatters.register self, *(::RSpec::Core::Formatters::Loader.formatters[::RSpec::Core::Formatters::HtmlFormatter])
 
+      DEFAULT_REPORT_PATH = File.expand_path("tmp/spec-results/index.html")
+
       # @private
       def initialize(output)
-        @output_path = File.expand_path(ENV["WATIR_RESULTS_PATH"] || (output.respond_to?(:path) ? output.path : "tmp/spec-results/index.html"))
-        FileUtils.rm_rf File.dirname(@output_path), :verbose => true if File.exists?(@output_path)
+        @output_path = File.expand_path(ENV["WATIR_RESULTS_PATH"] || output.kind_of?(File) && output.path || DEFAULT_REPORT_PATH)
+        cleanup_report_path(@output_path)
 
-        @output_relative_path = Pathname.new(@output_path).relative_path_from(Pathname.new(Dir.pwd))
-        puts "Results will be saved to #{@output_relative_path}"
+        output_relative_path = Pathname.new(@output_path).relative_path_from(Pathname.new(Dir.pwd))
+        log "results will be saved to #{output_relative_path}"
 
         @files_dir = File.dirname(@output_path)
         FileUtils.mkdir_p(@files_dir)
@@ -57,7 +58,19 @@ module Watir
 
       private
 
-      # @private
+      def cleanup_report_path(path)
+        if File.exist?(path)
+          reports_directory = File.dirname(path)
+
+          if path == DEFAULT_REPORT_PATH
+            log "cleaning up reports path at #{reports_directory}..."
+            FileUtils.rm_rf reports_directory
+          else
+            $stderr.puts "[WARN] #{self.class.name} reports directory automatically not deleted at #{reports_directory} to avoid possible data loss - make sure to do that manually before running specs to avoid this message and clutter from previous runs"
+          end
+        end
+      end
+
       def extra_failure_content(exception)
         return super unless example_group  # apparently there are cases where rspec failures are encountered and the example_group is not set (i.e. nil)
         browser = example_group.before_context_ivars[:@browser] || $browser
@@ -74,7 +87,7 @@ module Watir
       end
 
       def link_for(file)
-        return unless File.exists?(file[:path])
+        return unless File.exist?(file[:path])
 
         description = file[:desc] ? file[:desc] : File.extname(file[:path]).upcase[1..-1]
         path = Pathname.new(file[:path])
@@ -98,6 +111,10 @@ module Watir
         file_name
       end
 
+      def log(message)
+        puts "[#{self.class.name}] #{message}"
+      end
+
     end
   end
 end

data/lib/watir/rspec/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class RSpec
-    VERSION = "3.0.0"
+    VERSION = "5.0.0"
   end
 end

data/spec/watir/rspec/active_record_shared_connection_spec.rb

@@ -5,7 +5,7 @@ end
 
 describe TestModel do
   context ".connection" do
-    before { described_class.class_variable_set :@@shared_connection, nil }
+    before { ActiveRecord::Base.class_variable_set :@@shared_connection, nil }
 
     it "reuses the connection" do
       expect(described_class).to receive(:retrieve_connection).once.and_return(:established_connection)

data/spec/watir/rspec/helper_spec.rb

@@ -25,14 +25,14 @@ describe Watir::RSpec::Helper do
       before { @browser = double("browser") }
 
       it "are delegated to browser" do
-        expect(@browser).to receive(:window).with(title: "my_window") { |&block| block.call }
+        expect(@browser).to receive(:window).with({title: "my_window"}) { |&block| block.call }
 
         block_parameter = lambda { "my block content" }
         expect(window(title: "my_window", &block_parameter)).to be == "my block content"
       end
 
       it "having parameters are properly delegated to browser" do
-        expect(@browser).to receive(:window).with(:title => "my_window").and_yield("first", "second")
+        expect(@browser).to receive(:window).with({title: "my_window"}).and_yield("first", "second")
 
         block_parameter = lambda { |parameter_1, parameter_2| [parameter_1, parameter_2] }
         expect(window(title: "my_window", &block_parameter)).to be == ["first", "second"]

data/watir-rspec.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_dependency "rspec", "~>3.0"
-  gem.add_dependency "watir", ">= 6.0.0.beta4"
+  gem.add_dependency "watir", ">= 7.2.2"
 
   gem.add_development_dependency "yard"
   gem.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta4
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta4
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -131,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Use Watir with RSpec with ease.
@@ -143,4 +142,3 @@ test_files:
 - spec/watir/rspec/matchers/base_matcher_spec.rb
 - spec/watir/rspec/matchers_spec.rb
 - spec/watir/rspec_spec.rb
-has_rdoc: