page_magic 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da71e330b1c223cf3bae293c485653388c8e7db834f6c4fc3ac1de274763a46
-  data.tar.gz: da53a97958f3a55557dfb23b0b67054d6375b0f7151777b24d0e7046d982f871
+  metadata.gz: c1a9811611ede317ffdd2a0bbc3a611f6eed20c8c23bd5bd7cbd355f0c66d660
+  data.tar.gz: 728d6cda028973338f615612b213f22c8954ea7e18322d6b4cdb078c7a9e8a9a
 SHA512:
-  metadata.gz: 292d751ef686fad2d35b21c90c59b89b906ec1173a1d2c4ded593760e9890cd0152c535899a70fc6c887525e96b8a56b5c5708247caf8aa84fb2f768d10ebcf2
-  data.tar.gz: b7e9e00a2c766aa9e6e98087e9e5d7bd0ac04498f256a5854667558d8e5f4bb21a22b1cdbcaa8b016ca18cc6c5521ca6169266226a89c93387228e2305f702b5
+  metadata.gz: 756ebdd5a0d88342fe934ef27abc8cf96bdb5ac2478dd89b421ff4d5343812d1aca9e5fde7b19bad993101f38c9ed44ecfa0a8d6d0eb8319ba87604d42da60f0
+  data.tar.gz: 44e72e003481db7ea23ec3716ce36f6fc8f767d805effef34c3f094c08f2ebbe3ace017bf080d56bb067653b46d4fa334d22bfdac4fe81ca98472f1a8fba9f61

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/lib/page_magic/mapping.rb

@@ -3,7 +3,6 @@
 require_relative '../active_support/core_ext/object/to_query'
 require_relative 'comparator'
 
-
 module PageMagic
   # models mapping used to relate pages to uris
   class Mapping

data/lib/page_magic/session.rb

@@ -32,16 +32,6 @@ module PageMagic
       @current_page
     end
 
-    # @return [String] path in the browser
-    def current_path
-      raw_session.current_path
-    end
-
-    # @return [String] full url in the browser
-    def current_url
-      raw_session.current_url
-    end
-
     # Map paths to Page classes. The session will auto load page objects from these mapping when
     # the {Session#current_path}
     # is matched.
@@ -54,26 +44,22 @@ module PageMagic
       @transitions = Transitions.new(transitions)
     end
 
-    #  execute javascript on the browser
-    #  @param [String] script the script to be executed
-    #  @return [Object] object returned by the capybara execute_script method
-    # @raise [NotSupportedException] if the capybara driver in use does not support execute script
-    def execute_script(script)
-      raw_session.execute_script(script)
-    rescue Capybara::NotSupportedByDriverError
-      raise NotSupportedException, UNSUPPORTED_OPERATION_MSG
-    end
-
     # proxies unknown method calls to the currently loaded page object
     # @return [Object] returned object from the page object method call
     def method_missing(name, *args, &block)
+      return raw_session.send(name, *args, &block) if raw_session.respond_to?(name)
+
       current_page.send(name, *args, &block)
     end
 
+    def on?(page_class)
+      current_page.is_a?(page_class)
+    end
+
     # @param args see {::Object#respond_to?}
     # @return [Boolean] true if self or the current page object responds to the give method name
     def respond_to_missing?(*args)
-      super || current_page.respond_to?(*args)
+      super || current_page.respond_to?(*args) || raw_session.respond_to?(*args)
     end
 
     # Direct the browser to the given page or url. {Session#current_page} will be set be an instance of the given/mapped

data/spec/page_magic/session_spec.rb

@@ -40,20 +40,6 @@ RSpec.describe PageMagic::Session do
     end
   end
 
-  describe '#current_path' do
-    it "returns the browser's current path" do
-      browser.visit('/url')
-      expect(session.current_path).to eq(browser.current_path)
-    end
-  end
-
-  describe '#current_url' do
-    it "returns the browser's current url" do
-      browser.visit('/url')
-      expect(session.current_url).to eq(session.current_url)
-    end
-  end
-
   describe '#define_page_mappings' do
     context 'when the mapping includes a literal' do
       it 'creates a matcher to contain the specification' do
@@ -71,22 +57,6 @@ RSpec.describe PageMagic::Session do
     end
   end
 
-  describe '#execute_script' do
-    it 'calls the execute script method on the capybara session' do
-      allow(browser).to receive(:execute_script).with(:script).and_return(:result)
-      expect(session.execute_script(:script)).to be(:result)
-    end
-
-    context 'when the Capybara session does not support #execute_script' do
-      let(:browser) { Capybara::Driver::Base.new }
-
-      it 'raises an error' do
-        expected_message = described_class::UNSUPPORTED_OPERATION_MSG
-        expect { session.execute_script(:script) }.to raise_error(PageMagic::NotSupportedException, expected_message)
-      end
-    end
-  end
-
   describe '#method_missing' do
     before do
       page.class_eval do
@@ -100,6 +70,13 @@ RSpec.describe PageMagic::Session do
       session = described_class.new(browser).visit(page, url: 'http://base.url')
       expect(session.my_method).to be(:called)
     end
+
+    context 'when method not on current page' do
+      it 'delegates to the capybara session' do
+        session = described_class.new(browser).visit(page, url: 'http://base.url')
+        expect(session).to have_text('ok')
+      end
+    end
   end
 
   describe '#respond_to?' do
@@ -123,6 +100,13 @@ RSpec.describe PageMagic::Session do
         expect(session.respond_to?(:my_method)).to eq(true)
       end
     end
+
+    context 'when method not on self or the current page' do
+      it 'checks the capybara session' do
+        session = described_class.new(browser)
+        expect(session).to respond_to(:has_text?)
+      end
+    end
   end
 
   describe '#visit' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Leon Davis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport