capybara-restore_state 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 48500d9a5708410946422258c045c6b915e3370f
-  data.tar.gz: 5f769fcceb84727634c728f283327335548ded23
+SHA256:
+  metadata.gz: 794692cb3a7278028069ff9a30e7313736b3a7394440924e021265122b6b4029
+  data.tar.gz: 66eaa679887ed1d7822b93882fc43d6fdbffd2f79b739c60d64fe2da098bd728
 SHA512:
-  metadata.gz: 018808ec55c0e68389e9fa69bd6430d70dddabf77144345c2a819b44cd2ba9edadc6f116014864866e8a25e8097bb3d75ba29436456510a18b1f0bd335424754
-  data.tar.gz: 700925e61bf577fda2348df428393f336c4deead5d54a824b2064d7e5fd27150e55a1f902929a9302e098c7d6be74c60166da9f8c405075c5776c64ce5432b92
+  metadata.gz: ee80045fca52c72aa433bd11c97ece4664bac495941b4e69b9c2681fbe3865c85986b32ac7f2a1e27575baad1baad93701fccb22a7f719c900c840498824dc7f
+  data.tar.gz: ba9ead11dbb66abd8f1828dbae5da5e46f080b9667a8da95e9c61d31dad4cad19476d42a3e8269d10bade9302966b0c15d5994f4ca9120d85cc416db61ca8357

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.0.1 (2022-06-21)
+
+* Work with rack-test 2.0.0+ (jeremyevans)
+
 === 1.0.0 (2016-05-25)
 
 * Initial Public Release

data/Rakefile

@@ -1,14 +1,8 @@
-require "rake"
 require "rake/clean"
-require 'rake/testtask'
+require "rdoc/task"
 
 CLEAN.include ["capybara-restore_state-*.gem", "rdoc", "coverage"]
 
-desc "Build enum_csv gem"
-task :package=>[:clean] do |p|
-  sh %{#{FileUtils::RUBY} -S gem build capybara-restore_state.gemspec}
-end
-
 ### Specs
 
 desc "Run specs"
@@ -16,31 +10,26 @@ task :default=>:spec
 
 desc "Run specs"
 task :spec do
-  sh "#{FileUtils::RUBY} spec/capybara-restore_state_spec.rb"
-end
-### RDoc
-
-RDOC_DEFAULT_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', 'capybara-restore_state: Restore capybara state after block execution']
-
-begin
-  gem 'hanna-nouveau'
-  RDOC_DEFAULT_OPTS.concat(['-f', 'hanna'])
-rescue Gem::LoadError
+  sh "#{FileUtils::RUBY} #{'-w' if RUBY_VERSION >= '3'} spec/capybara-restore_state_spec.rb"
 end
 
-rdoc_task_class = begin
-  require "rdoc/task"
-  RDoc::Task
-rescue LoadError
-  require "rake/rdoctask"
-  Rake::RDocTask
+desc "Run tests with coverage"
+task :spec_cov do
+  ENV['COVERAGE'] = '1'
+  sh "#{FileUtils::RUBY} spec/capybara-restore_state_spec.rb"
 end
 
-RDOC_OPTS = RDOC_DEFAULT_OPTS + ['--main', 'README.rdoc']
+### RDoc
 
-rdoc_task_class.new do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
-  rdoc.options += RDOC_OPTS
+  rdoc.options += ["--quiet", "--line-numbers", "--inline-source", '--title', 'capybara-restore_state: Restore capybara state after block execution', '--main', 'README.rdoc']
+
+  begin
+    gem 'hanna-nouveau'
+    rdoc.options += ['-f', 'hanna']
+  rescue Gem::LoadError
+  end
+
   rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/**/*.rb"
 end
-

data/lib/capybara/restore_state.rb

@@ -3,7 +3,8 @@ require 'capybara'
 module Capybara::RestoreState
   # Yield to the block, restoring the capybara session state after block execution.
   def restore_state
-    mock_session = page.driver.browser.instance_variable_get(:@_rack_mock_sessions)[:default]
+    browser = page.driver.browser
+    mock_session = browser.instance_variable_get(:@_rack_test_current_session) || browser.instance_variable_get(:@_rack_mock_sessions)[:default]
     last_response = mock_session.last_response
     last_request = mock_session.last_request
     yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-restore_state
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  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: |
   capybara-restore_state offers the ability to execute a block where the
   initial capybara state on entering the block is returned after the block
@@ -56,11 +70,14 @@ files:
 - README.rdoc
 - Rakefile
 - lib/capybara/restore_state.rb
-- spec/capybara-restore_state_spec.rb
 homepage: http://github.com/jeremyevans/capybara-restore_state
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/jeremyevans/capybara-restore_state
+  bug_tracker_uri: https://github.com/jeremyevans/capybara-restore_state/issues
+  mailing_list_uri: https://github.com/jeremyevans/capybara-restore_state/discussions
+  changelog_uri: https://github.com/jeremyevans/capybara-restore_state/blob/master/CHANGELOG
 post_install_message: 
 rdoc_options:
 - "--quiet"
@@ -83,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Restore capybara state after block execution

data/spec/capybara-restore_state_spec.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-gem 'minitest'
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'capybara'
-require 'capybara/dsl'
-require './lib/capybara/restore_state'
-
-MyRackApp = lambda do |env|
-  s = "<html><body><form action='/a'>#{env['PATH_INFO']}<input type='submit' value='Submit' /></form></body></html>"
-  [200, {'Content-Length'=>s.length}, s]
-end
-Capybara.app = MyRackApp
-
-describe Capybara::RestoreState do
-  include Rack::Test::Methods
-  include Capybara::DSL
-  include Capybara::RestoreState
-
-  def app
-    MyRackApp
-  end
-
-  it "should allow restoring of state" do
-    visit '/'
-    page.current_path.must_equal '/'
-    page.text.must_equal '/'
-
-    restore_state do
-      page.text.must_equal '/'
-      page.current_path.must_equal '/'
-      click_button 'Submit'
-      page.current_path.must_equal '/a'
-      page.text.must_equal '/a'
-    end
-
-    page.current_path.must_equal '/'
-    page.text.must_equal '/'
-    click_button 'Submit'
-    page.current_path.must_equal '/a'
-    page.text.must_equal '/a'
-  end
-end