wayfarer 0.4.0 → 0.4.4

data/spec/routing/{uri_matcher_spec.rb → matchers/uri_spec.rb}

@@ -2,14 +2,14 @@
 
 require "spec_helpers"
 
-describe Wayfarer::Routing::URLMatcher do
+describe Wayfarer::Routing::Matchers::URL do
   subject(:matcher) do
-    Wayfarer::Routing::URLMatcher.new("http://example.com/foo/bar")
+    Wayfarer::Routing::Matchers::URL.new("http://example.com/foo/bar")
   end
 
   describe "#match" do
     context "with matching URL" do
-      let(:url) { URI("http://example.com/foo/bar") }
+      let(:url) { Addressable::URI.parse("http://example.com/foo/bar") }
 
       it "returns true" do
         expect(matcher).to match(url)
@@ -17,7 +17,7 @@ describe Wayfarer::Routing::URLMatcher do
     end
 
     context "with mismatching URL" do
-      let(:url) { URI("http://example.com/foo/qux") }
+      let(:url) { Addressable::URI.parse("http://example.com/foo/qux") }
 
       it "returns true" do
         expect(matcher).not_to match(url)

data/spec/routing/path_finder_spec.rb

@@ -9,7 +9,7 @@ describe Wayfarer::Routing::PathFinder do
     end
   end
 
-  subject(:result) { Wayfarer::Routing::PathFinder.result(route, URI(url)) }
+  subject(:result) { Wayfarer::Routing::PathFinder.result(route, Addressable::URI.parse(url)) }
 
   describe "::result" do
     context "with matching URL" do

data/spec/routing/root_route_spec.rb

@@ -13,7 +13,7 @@ describe Wayfarer::Routing::Route do
 
       it "returns true" do
         %w[http://example.com http://w3c.org http://google.com].each do |url|
-          expect(matcher).to match(URI(url))
+          expect(matcher).to match(Addressable::URI.parse(url))
         end
       end
     end
@@ -21,7 +21,7 @@ describe Wayfarer::Routing::Route do
     context "without child routes" do
       it "returns false" do
         %w[http://example.com http://w3c.org http://google.com].each do |url|
-          expect(matcher).not_to match(URI(url))
+          expect(matcher).not_to match(Addressable::URI.parse(url))
         end
       end
     end

data/spec/routing/route_spec.rb

@@ -14,7 +14,7 @@ describe Wayfarer::Routing::Route do
           end
         end
 
-        result = root.invoke(URI("http://example.com/foo/bar?page=42"))
+        result = root.invoke(Addressable::URI.parse("http://example.com/foo/bar?page=42"))
 
         expect(result).to be_a(Wayfarer::Routing::Result::Match)
         expect(result.action).to be(:overrider)
@@ -34,7 +34,7 @@ describe Wayfarer::Routing::Route do
           end
         end
 
-        result = root.invoke(URI("http://w3c.org/foo/bar?page=42"))
+        result = root.invoke(Addressable::URI.parse("http://w3c.org/foo/bar?page=42"))
 
         expect(result).to be_a(Wayfarer::Routing::Result::Mismatch)
       end

data/spec/routing/router_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "spec_helpers"
+
+describe Wayfarer::Routing::Router do
+  subject(:router) do
+    described_class.new.tap do |router|
+      router.draw do |alpha, beta|
+        path alpha, to: :alpha
+        path beta, to: :beta
+      end
+    end
+  end
+
+  describe "#invoke" do
+    let(:url) { Addressable::URI.parse("https://example.com/alpha") }
+
+    it "evaluates routes" do
+      result = router.invoke(url, %w[/alpha /beta])
+      expect(result).to be_a(Wayfarer::Routing::Result::Match)
+      expect(result.action).to be(:alpha)
+    end
+  end
+end

data/spec/spec_helpers.rb

@@ -3,20 +3,21 @@
 require "factory_bot"
 require "pry"
 require "sinatra"
+require "capybara/cuprite"
 
 require_relative "../lib/wayfarer"
 require_relative "support/test_app"
 
 module SpecHelpers
   def test_app_path(path)
-    File.join(test_app_host, path)
+    File.join("http://", test_app_host, path)
   end
 
   def test_app_host
     if ENV["CI"]
-      "http://test:9876"
+      "test:9876"
     else
-      "http://localhost:9876"
+      "localhost:9876"
     end
   end
 
@@ -32,6 +33,13 @@ module SpecHelpers
     FileUtils.mkdir_p(Pathname.new(path).dirname)
     IO.write(path, contents)
   end
+
+  # ActiveJob test helpers swallow errors
+  Base = Class.new(Wayfarer::Base) do
+    rescue_from(StandardError) do |e|
+      raise e
+    end
+  end
 end
 
 RSpec.configure do |config|
@@ -59,8 +67,8 @@ RSpec.configure do |config|
   end
 
   config.before do
-    Wayfarer.config = Wayfarer::Config.from_environment
-    Wayfarer.config.redis_url = redis_host
+    Wayfarer.config = Wayfarer::Config::Root.new
+    Wayfarer.config.redis.url = redis_host
 
     ::Redis.new(url: redis_host).flushall
 
@@ -73,9 +81,17 @@ RSpec.configure do |config|
       # For unknown reasons, Wayfarer::Networking::Ferrum#renew can take a very
       # long time to instantiate a new ::Ferrum::Browser and requires the 60s
       # timeout. TODO: Figure out what's going on
-      Wayfarer.config.ferrum_options = { url: "http://chrome:3000", timeout: 60 }
-      Wayfarer.config.selenium_argv = [:firefox, { url: "http://firefox:4444" }]
+      Wayfarer.config.ferrum.options = { url: "http://chrome:3000", timeout: 120 }
+      Wayfarer.config.selenium.driver = :firefox
+      Wayfarer.config.selenium.options = { url: "http://firefox:4444" }
+      Wayfarer.config.selenium.client_timeout = 10
     end
+
+    # TODO: Undo side-effect
+    Capybara.register_driver(:cuprite) do |app|
+      Capybara::Cuprite::Driver.new(app, Wayfarer.config.ferrum.options)
+    end
+    Wayfarer.config.capybara.driver = :cuprite
   end
 
   config.around(cli: true) do |example|
@@ -83,7 +99,7 @@ RSpec.configure do |config|
     tmp = Dir.mktmpdir
     Dir.chdir(tmp)
     example.run
-    FileUtils.rm_r(tmp)
     Dir.chdir(origin)
+    FileUtils.rm_r(tmp)
   end
 end