From 86b43c8b7f4984b28c52b40806b5584768e33120 Mon Sep 17 00:00:00 2001
From: Carl Allen <carl.allen@sportngin.com>
Date: Wed, 1 Mar 2017 14:45:52 -0600
Subject: [PATCH 1/3] Rails 4.1 support

---
 lib/webrat/adapters/rails.rb                                | 4 ++--
 lib/webrat/integrations/rack.rb                             | 4 ++--
 lib/webrat/integrations/rails.rb                            | 6 +++---
 lib/webrat/integrations/selenium.rb                         | 2 +-
 .../integration/rails/test/integration/button_click_test.rb | 2 +-
 spec/integration/rails/test/integration/fill_in_test.rb     | 2 +-
 spec/integration/rails/test/integration/link_click_test.rb  | 2 +-
 spec/integration/rails/test/integration/webrat_test.rb      | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/webrat/adapters/rails.rb b/lib/webrat/adapters/rails.rb
index fadb4239..de8ad71f 100644
--- a/lib/webrat/adapters/rails.rb
+++ b/lib/webrat/adapters/rails.rb
@@ -1,9 +1,9 @@
 require "webrat/integrations/rails"
-require "action_controller/record_identifier"
+require "action_view/record_identifier"
 
 module Webrat
   class RailsAdapter #:nodoc:
-    include ActionController::RecordIdentifier
+    include ActionView::RecordIdentifier
 
     attr_reader :integration_session
 
diff --git a/lib/webrat/integrations/rack.rb b/lib/webrat/integrations/rack.rb
index 72ce984d..de24411b 100644
--- a/lib/webrat/integrations/rack.rb
+++ b/lib/webrat/integrations/rack.rb
@@ -1,5 +1,5 @@
-if defined?(ActionController::IntegrationTest)
-  module ActionController #:nodoc:
+if defined?(ActionDispatch::IntegrationTest)
+  module ActionDispatch #:nodoc:
     IntegrationTest.class_eval do
       include Rack::Test::Methods
       include Webrat::Methods
diff --git a/lib/webrat/integrations/rails.rb b/lib/webrat/integrations/rails.rb
index 3be4ef0c..cfb363e9 100644
--- a/lib/webrat/integrations/rails.rb
+++ b/lib/webrat/integrations/rails.rb
@@ -1,7 +1,7 @@
-require "action_controller"
-require "action_controller/integration"
+require "action_dispatch"
+require "action_dispatch/testing/integration"
 
-module ActionController #:nodoc:
+module ActionDispatch #:nodoc:
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Matchers
diff --git a/lib/webrat/integrations/selenium.rb b/lib/webrat/integrations/selenium.rb
index 37ebeb55..01cb5d8c 100644
--- a/lib/webrat/integrations/selenium.rb
+++ b/lib/webrat/integrations/selenium.rb
@@ -1,6 +1,6 @@
 require "webrat/selenium"
 
-if defined?(ActionController::IntegrationTest)
+if defined?(ActionDispatch::IntegrationTest)
   module ActionController #:nodoc:
     IntegrationTest.class_eval do
       include Webrat::Methods
diff --git a/spec/integration/rails/test/integration/button_click_test.rb b/spec/integration/rails/test/integration/button_click_test.rb
index d8dabe59..f982aece 100644
--- a/spec/integration/rails/test/integration/button_click_test.rb
+++ b/spec/integration/rails/test/integration/button_click_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ButtonClickTest < ActionController::IntegrationTest
+class ButtonClickTest < ActionDispatch::IntegrationTest
   # <button type="submit" ...>
   test "should click button with type submit by id" do
     visit buttons_path
diff --git a/spec/integration/rails/test/integration/fill_in_test.rb b/spec/integration/rails/test/integration/fill_in_test.rb
index 6620ce60..a64ceffc 100644
--- a/spec/integration/rails/test/integration/fill_in_test.rb
+++ b/spec/integration/rails/test/integration/fill_in_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FillInTest < ActionController::IntegrationTest
+class FillInTest < ActionDispatch::IntegrationTest
   test "should fill in text field by name" do
     visit fields_path
     fill_in "field_by_name", :with => "value"
diff --git a/spec/integration/rails/test/integration/link_click_test.rb b/spec/integration/rails/test/integration/link_click_test.rb
index 5c143a59..99ecfc9d 100644
--- a/spec/integration/rails/test/integration/link_click_test.rb
+++ b/spec/integration/rails/test/integration/link_click_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class LinkClickTest < ActionController::IntegrationTest
+class LinkClickTest < ActionDispatch::IntegrationTest
   test "should click link by text" do
     visit links_path
     click_link "LinkByText"
diff --git a/spec/integration/rails/test/integration/webrat_test.rb b/spec/integration/rails/test/integration/webrat_test.rb
index e06f265a..6289cfbd 100644
--- a/spec/integration/rails/test/integration/webrat_test.rb
+++ b/spec/integration/rails/test/integration/webrat_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class WebratTest < ActionController::IntegrationTest
+class WebratTest < ActionDispatch::IntegrationTest
 
   #Firefox raises a security concern under Selenium
   unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'

From fc1b0ce7839ff49e3bb6ba710728cea54883d1fe Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian.fletcher@sportngin.com>
Date: Tue, 4 Oct 2022 12:21:00 -0400
Subject: [PATCH 2/3] Use keyword arguments, bump minor version

---
 History.txt                  | 8 +++++++-
 lib/webrat.rb                | 2 +-
 lib/webrat/adapters/rails.rb | 2 +-
 webrat.gemspec               | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/History.txt b/History.txt
index 9a3316ea..31a2f240 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,9 @@
+== 0.8.0 / 2022-10-04
+
+* Minor enhancements
+
+  * Webrat::RailsAdapter#do_request uses keyword arguments for data and headers to support Rails 5.1+
+
 == 0.7.5 / 2011-11-19
 
 * Minor enhancements
@@ -57,7 +63,7 @@
   * Removed save_and_open_page's rewriting of static asset paths before saving (was not actually working) (Noah Davis)
   * Make "should contain" ignore extra whitespace when doing string comparisons (Noah Davis)
   * Make selenium matchers handle negative match more consistently with positive match (Luke Melia)
-   
+
 == 0.6.0 / 2009-11-28
 
 REMOVED: Support for Hpricot + REXML as an alternative to Nokogiri.
diff --git a/lib/webrat.rb b/lib/webrat.rb
index 617fe7b0..d6112915 100644
--- a/lib/webrat.rb
+++ b/lib/webrat.rb
@@ -2,7 +2,7 @@
 require "nokogiri"
 
 module Webrat
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 
   autoload :MechanizeAdapter, "webrat/adapters/mechanize"
   autoload :MerbAdapter, "webrat/adapters/merb"
diff --git a/lib/webrat/adapters/rails.rb b/lib/webrat/adapters/rails.rb
index fadb4239..0886ff04 100644
--- a/lib/webrat/adapters/rails.rb
+++ b/lib/webrat/adapters/rails.rb
@@ -47,7 +47,7 @@ def xml_content_type?
 
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
-      integration_session.send(http_method, normalize_url(url), data, headers)
+      integration_session.send(http_method, normalize_url(url), params: data, headers: headers)
     end
 
     # remove protocol, host and anchor
diff --git a/webrat.gemspec b/webrat.gemspec
index 1e6f607b..7d58eb1c 100644
--- a/webrat.gemspec
+++ b/webrat.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webrat}
-  s.version = "0.7.5"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]

From 9a107eaa080d9936cfcd35beb9aff178a84f8cd0 Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian.fletcher@sportngin.com>
Date: Tue, 4 Oct 2022 12:35:39 -0400
Subject: [PATCH 3/3] Trigger build