page_magic 1.0.0.alpha8 → 1.0.0.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfda87e1bb18198d7cd95b36a339ff68be3cf778
-  data.tar.gz: 3d95a82ed45417528a116e49ee141a30b0537d41
+  metadata.gz: 913ffb021a5d651dd495d38676e28a3db2d0f51d
+  data.tar.gz: b61ef053d8a6de10e24386904f5e469f5a34e72e
 SHA512:
-  metadata.gz: 2bfc886d3de8e0a2ae4993c9820eee29cff4816663a9dd55891d55ebf221a6fbb046f838e38c85873f59e158a072160a08c149eddd3dc24297c4ec0d95be64c1
-  data.tar.gz: 908fcba5e372276d9d0729cba67d093d0bdeb50c42f598c7eb7f34ebf461e20f969e871be7def748e69901313ff894d949ba93a9147100100a4f7b1439508311
+  metadata.gz: ae0c743e1683f12841c77ba81d53ebe985faedbf0cd71d9560abe898a6b7f5473feb4ac256c58e8d1f2b3998843a32b7bc3665cc414e88f9502f584c832d86ef
+  data.tar.gz: 48d8d12ad1dbb5008987e0fca4a78b897c84001826a72069ecf605b3412cb4c89c809473e0ad77168757ca236ef2ebbbdca967449b6319b42598f680d73be08f

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha8
+1.0.0.alpha9

data/lib/page_magic/driver.rb

@@ -11,9 +11,7 @@ module PageMagic
     end
 
     def build(app, browser:, options:{})
-      options[:browser] = browser
-      driver_clazz = handler.call
-      driver_clazz.new(app, options)
+      handler.call(app, options, browser)
     end
   end
 end

data/lib/page_magic/drivers/poltergeist.rb

@@ -1,8 +1,8 @@
 module PageMagic
   class Drivers
-    Poltergeist = Driver.new(:poltergeist) do
+    Poltergeist = Driver.new(:poltergeist) do |app, options|
       require 'capybara/poltergeist'
-      Capybara::Poltergeist::Driver
+      Capybara::Poltergeist::Driver.new(app, options)
     end
   end
 end

data/lib/page_magic/drivers/rack_test.rb

@@ -1,7 +1,7 @@
 module PageMagic
   class Drivers
-    RackTest = Driver.new(:rack_test) do
-      Capybara::RackTest::Driver
+    RackTest = Driver.new(:rack_test) do |app, options|
+      Capybara::RackTest::Driver.new(app, options)
     end
   end
 end

data/lib/page_magic/drivers/selenium.rb

@@ -1,8 +1,8 @@
 module PageMagic
   class Drivers
-    Selenium = Driver.new(:chrome, :firefox) do
+    Selenium = Driver.new(:chrome, :firefox) do |app, options, browser|
       require 'watir-webdriver'
-      Capybara::Selenium::Driver
+      Capybara::Selenium::Driver.new(app, options.dup.merge(browser: browser))
     end
   end
 end

data/spec/page_magic/driver_spec.rb

@@ -2,23 +2,8 @@ require 'page_magic/driver'
 
 module PageMagic
   describe Driver do
-    let(:driver_class) do
-      Class.new do
-        attr_reader :rack_app, :options
-        def initialize(rack_app, options)
-          @rack_app = rack_app
-          @options = options
-        end
-
-        def ==(driver)
-          driver.rack_app == rack_app && driver.options == options
-        end
-      end
-    end
     subject do
-      described_class.new :custom_browser do
-        driver_class
-      end
+      described_class.new :custom_browser
     end
 
     describe '#supports?' do
@@ -35,12 +20,22 @@ module PageMagic
       end
     end
     describe '#build' do
-      it 'adds the browser to the options supplied to the driver' do
-        expect(subject.build(:rack_app, browser: :custom_browser, options: {}).options).to eq(browser: :custom_browser)
+
+      it 'returns the result of the block passed to the driver class constructor' do
+        subject = described_class.new(:custom_browser)do
+          :driver
+        end
+        expect(subject.build(:rack_app, browser: :custom_browser, options: :options)).to eq(:driver)
       end
 
-      it 'creates an instance of the supplied driver' do
-        expect(subject.build(:rack_app, browser: :custom_browser, options: {})).to eq(driver_class.new(:rack_app, browser: :custom_browser))
+      it 'passes rack app to the handler' do
+        subject = described_class.new(:custom_browser) do |app, options, browser|
+            expect(app).to eq(:rack_app)
+            expect(options).to eq(:options)
+            expect(browser).to eq(:browser)
+        end
+
+        subject.build(:rack_app, options: :options, browser: :browser)
       end
     end
   end

data/spec/page_magic/drivers/selenium_spec.rb

@@ -2,9 +2,16 @@ require 'page_magic/drivers/selenium'
 module PageMagic
   class Drivers
     describe Selenium do
+      subject do
+        described_class.build(:app, browser: :selenium, options: {})
+      end
+
       it 'is selenium' do
-        driver = described_class.build(:app, browser: :selenium, options: {})
-        expect(driver).to be_a(Capybara::Selenium::Driver)
+        expect(subject).to be_a(Capybara::Selenium::Driver)
+      end
+
+      it 'sets the browser option' do
+        expect(subject.options[:browser]).to be(:selenium)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha8
+  version: 1.0.0.alpha9
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara