Fix retrieval of session_options for RSpec matcher descriptions

lib/capybara/rspec/matchers.rb

@@ -45,7 +45,13 @@ module Capybara
 
       def session_options
         @context_el ||= nil
-        @context_el ? @context_el.session_options : Capybara.session_options
+        if @context_el.respond_to? :session_options
+          @context_el.session_options
+        elsif @context_el.respond_to? :current_scope
+          @context_el.current_scope.session_options
+        else
+          Capybara.session_options
+        end
       end
     end
 

spec/rspec_matchers_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Capybara RSpec Matchers', :type => :feature, focus_: true do
+  context "after called on session" do
+    it "HaveSelector should allow getting a description of the matcher" do
+      visit('/with_html')
+      matcher = have_selector(:css, 'h2.head', minimum: 3)
+      expect(page).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+
+    it "HaveText should allow getting a description" do
+      visit('/with_html')
+      matcher = have_text("Lorem")
+      expect(page).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+  end
+
+  context "after called on element" do
+    it "HaveSelector should allow getting a description" do
+      visit('/with_html')
+      el = find(:css, '#first')
+      matcher = have_selector(:css, 'a#foo')
+      expect(el).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+
+    it "MatchSelector should allow getting a description" do
+      visit('/with_html')
+      el = find(:css, '#first')
+      matcher = match_selector(:css, '#first')
+      expect(el).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+
+    it "HaveText should allow getting a description" do
+      visit('/with_html')
+      el = find(:css, '#first')
+      matcher = have_text("Lorem")
+      expect(el).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+  end
+end