Moar tests

Author: dxg

spec/digestor_spec.rb

@@ -59,7 +59,7 @@ def template.virtual_path=(path)
 
   # Ruby 2.7 removed taint checking mechanism
   # https://blog.saeloun.com/2020/02/18/ruby-2-7-access-and-setting-of-safe-warned-will-become-global-variable.html
-  it "should marshal and taint the digest", if: Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7.0") do
+  it "should marshal and taint the digest", if: ruby_version_satisfies?('< 2.7.0') do
     digestor = SignedForm::Digestor.new(template)
     data = Marshal.dump digestor
     digestor = Marshal.load data

spec/form_builder_spec.rb

@@ -113,19 +113,21 @@ class MockBuilder < ActionView::Helpers::FormBuilder; end
   end
 
   describe "sign_destination" do
-    after do
-      @data.should include(:_options_)
-      @data[:_options_].should include(:method, :url)
-      @data[:_options_][:method].should == :post
-      @data[:_options_][:url].should == '/users/new'
+    def assert_method_and_url(content, method = :post, url = '/users/new')
+      data = get_data_from_form(content)
+
+      expect(data).to include(:_options_)
+      expect(data[:_options_]).to include(:method, :url)
+      expect(data[:_options_][:method]).to eql(method)
+      expect(data[:_options_][:url]).to eql(url)
     end
 
     it "should set a target" do
       content = form_for(User.new, signed: true, sign_destination: true) do |f|
         f.text_field :name
       end
 
-      @data = get_data_from_form(content)
+      assert_method_and_url(content)
     end
 
     it "should set a target when the default options are enabled" do
@@ -135,7 +137,51 @@ class MockBuilder < ActionView::Helpers::FormBuilder; end
         f.text_field :name
       end
 
-      @data = get_data_from_form(content)
+      assert_method_and_url(content)
+    end
+
+    it "should read method from options -> html" do
+      SignedForm.options[:sign_destination] = true
+
+      content = form_for(User.new, signed: true, html: { method: :get }) do |f|
+        f.text_field :name
+      end
+
+      assert_method_and_url(content, :get)
+    end
+
+    it "should read method from options" do
+      SignedForm.options[:sign_destination] = true
+
+      content = form_for(User.new, signed: true, method: :get) do |f|
+        f.text_field :name
+      end
+
+      assert_method_and_url(content, :get)
+    end
+
+    it "should infer method from object persisted state", if: rails_version_satisfies?('>= 7.2') do
+      SignedForm.options[:sign_destination] = true
+
+      user = User.new
+      allow(user).to receive(:persisted?).and_return(true)
+
+      content = form_for(user, signed: true) do |f|
+        f.text_field :name
+      end
+
+      # URL is funky because stubbing is imperfect
+      assert_method_and_url(content, :patch, '/users/new?model=1')
+    end
+
+    it "should read url from options", if: rails_version_satisfies?('< 7.0') do
+      SignedForm.options[:sign_destination] = true
+
+      content = form_for(User.new, signed: true, url: '/other/url') do |f|
+        f.text_field :name
+      end
+
+      assert_method_and_url(content, :post, '/other/url')
     end
   end
 
@@ -383,7 +429,7 @@ class MockBuilder < ActionView::Helpers::FormBuilder; end
 
   describe "fields_for" do
     it "should nest attributes" do
-      user.stub(widgets: [widget])
+      allow(user).to receive(:widgets).and_return([widget])
 
       content = form_for(user, signed: true) do |f|
         f.fields_for :widgets do |ff|

spec/permit_signed_params_spec.rb

@@ -28,11 +28,13 @@ def marshal_and_sign(data)
   before do
     SignedForm.secret_key = "abc123"
 
-    Controller.any_instance.stub(request: double('request', method: 'POST', request_method: 'POST', fullpath: '/users', url: '/users', variant: nil))
-    Controller.any_instance.stub(params: ActionController::Parameters.new("user" => { name: "Erich Menge", occupation: 'developer' }))
+    allow_any_instance_of(Controller).to receive_messages(
+      request: double('request', method: 'POST', request_method: 'POST', fullpath: '/users', url: '/users', variant: nil),
+      params: ActionController::Parameters.new("user" => { name: "Erich Menge", occupation: 'developer' })
+    )
 
-    params.stub(:[]).and_call_original
-    params.stub(:[]).with('user').and_return(params)
+    allow(params).to receive(:[]).and_call_original
+    allow(params).to receive(:[]).with('user').and_return(params)
   end
 
   it "should raise if signature isn't valid" do
@@ -41,7 +43,7 @@ def marshal_and_sign(data)
   end
 
   context "when the parameters are good" do
-    before { params.should_receive(:permit).with(:name).and_return(params) }
+    before { allow(params).to receive(:permit).with(:name).and_return(params) }
 
     it "should permit attributes that are allowed" do
       params['form_signature'] = marshal_and_sign "user" => [:name]
@@ -51,7 +53,7 @@ def marshal_and_sign(data)
     it "should verify current url matches targeted url" do
       params['form_signature'] = marshal_and_sign("user" => [:name], :_options_ => { method: 'post', url: '/users'  })
 
-      controller.request.should_receive(:fullpath).and_return '/users'
+      allow(controller.request).to receive(:fullpath).and_return '/users'
       controller.permit_signed_form_data
     end
   end
@@ -67,7 +69,7 @@ def marshal_and_sign(data)
   end
 
   context "when the digest is bad" do
-    before { digestor.stub(:to_s).and_return "bad" }
+    before { allow(digestor).to receive(:to_s).and_return "bad" }
 
     it "should not reject if inside grace period" do
       params['form_signature'] = marshal_and_sign("user" => [:name], :_options_ => { digest: digestor, digest_expiration: Time.now + 20 })

spec/spec_helper.rb

@@ -19,7 +19,6 @@ module SignedFormViewHelper
   end
 
   include ActionView::Context if defined?(ActionView::Context)
-  include ActionView::RoutingUrlFor
 
   include SignedForm::ActionView::FormHelper
 
@@ -28,8 +27,6 @@ module SignedFormViewHelper
     resources :users, controller: :users
   end
 
-  Routes.default_url_options.merge!(host: 'test.host')
-
   ActionView::RoutingUrlFor.include(Routes.url_helpers)
 
   include ActionView::RoutingUrlFor
@@ -46,36 +43,36 @@ def protect_against_forgery?
     false
   end
 
-  def user_path(*)
-    '/users'
-  end
-
   def polymorphic_path(*)
     '/users/new'
   end
 
   def controller(*)
     @controller ||= UsersController.new.tap do |ctl|
-      # path_parameters
       @request = ActionController::TestRequest.create(ctl.class)
       @request.path_parameters.merge!(controller: 'users', action: 'new')
 
       ctl.singleton_class.include Routes.url_helpers
 
       ctl.request = @request
-      ctl.instance_variable_set :@routes, Routes.url_helpers
     end
   end
 
-  def default_url_options
-    {}
-  end
-
   def get_data_from_form(content)
     Marshal.load Base64.strict_decode64(content.match(/name="form_signature" value="(.*)--/)[1])
   end
 end
 
+module Helpers
+  def ruby_version_satisfies?(ver)
+    Gem::Requirement.new(ver).satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  end
+
+  def rails_version_satisfies?(ver)
+    Gem::Requirement.new(ver).satisfied_by?(ActionPack::gem_version)
+  end
+end
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 
@@ -85,6 +82,8 @@ def get_data_from_form(content)
 
   config.order = 'random'
 
+  config.extend Helpers
+
   config.around(:each) do |example|
     pristine_module = SignedForm.dup
     example.run