8 files changed, 67 insertions, 78 deletions
diff --git a/actionsystemtest/test/cases/action_system_test_test.rb b/actionsystemtest/test/cases/action_system_test_test.rb
new file mode 100644
index 0000000000..732c06ba20
--- /dev/null
+++ b/actionsystemtest/test/cases/action_system_test_test.rb
@@ -0,0 +1,34 @@
+require "active_support/testing/autorun"
+require "action_system_test"
+
+class ActionSystemTestTest < ActiveSupport::TestCase
+  test "driven_by sets Capybara's default driver to poltergeist" do
+    ActionSystemTest::Base.driven_by :poltergeist
+
+    assert_equal :poltergeist, Capybara.default_driver
+  end
+
+  test "driven_by defaults to port 21800" do
+    ActionSystemTest::Base.driven_by :poltergeist
+
+    assert_equal 21800, Capybara.server_port
+  end
+
+  test "driven_by can change Capybara's server port" do
+    ActionSystemTest::Base.driven_by :selenium, on: 3000
+
+    assert_equal 3000, Capybara.server_port
+  end
+
+  test "driven_by sets Capybara's drivers respectively" do
+    ActionSystemTest::Base.driven_by :selenium, using: :chrome
+
+    assert_includes Capybara.drivers, :selenium
+    assert_includes Capybara.drivers, :chrome
+    assert_equal :chrome, Capybara.default_driver
+  end
+
+  test "selenium? returns false if driver is poltergeist" do
+    assert_not ActionSystemTest::Base.selenium?(:poltergeist)
+  end
+end
diff --git a/actionsystemtest/test/cases/browser_test.rb b/actionsystemtest/test/cases/browser_test.rb
new file mode 100644
index 0000000000..05e260abfa
--- /dev/null
+++ b/actionsystemtest/test/cases/browser_test.rb
@@ -0,0 +1,10 @@
+require "active_support/testing/autorun"
+require "action_system_test"
+
+class BrowserTest < ActiveSupport::TestCase
+  test "initializing the browser" do
+    browser = ActionSystemTest::Browser.new(:chrome, [ 1400, 1400 ])
+    assert_equal :chrome, browser.instance_variable_get(:@name)
+    assert_equal [ 1400, 1400 ], browser.instance_variable_get(:@screen_size)
+  end
+end
diff --git a/actionsystemtest/test/cases/capybara_driver_test.rb b/actionsystemtest/test/cases/capybara_driver_test.rb
deleted file mode 100644
index 33337ad18b..0000000000
--- a/actionsystemtest/test/cases/capybara_driver_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "abstract_unit"
-
-class CapybaraDriverTest < ActiveSupport::TestCase
-  def setup
-    ActionSystemTest.driver = :poltergeist
-  end
-
-  def test_default_driver_adapter
-    assert_kind_of ActionSystemTest::DriverAdapters::CapybaraDriver, ActionSystemTest.driver
-  end
-
-  def test_default_settings
-    assert_equal :poltergeist, ActionSystemTest.driver.name
-    assert_equal :puma, ActionSystemTest.driver.server
-    assert_equal 28100, ActionSystemTest.driver.port
-  end
-
-  def test_setting_driver
-    ActionSystemTest.driver = :webkit
-
-    assert_equal :webkit, ActionSystemTest.driver.name
-  end
-
-  def test_setting_server
-    ActionSystemTest.driver = ActionSystemTest::DriverAdapters::CapybaraDriver.new(
-      server: :webrick
-    )
-
-    assert_equal :webrick, ActionSystemTest.driver.server
-  end
-
-  def test_setting_port
-    ActionSystemTest.driver = ActionSystemTest::DriverAdapters::CapybaraDriver.new(
-      port: 3000
-    )
-
-    assert_equal 3000, ActionSystemTest.driver.port
-  end
-end
diff --git a/actionsystemtest/test/cases/driver_adapter_test.rb b/actionsystemtest/test/cases/driver_adapter_test.rb
deleted file mode 100644
index cecaa5b958..0000000000
--- a/actionsystemtest/test/cases/driver_adapter_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "abstract_unit"
-
-class DriverAdapterTest < ActiveSupport::TestCase
-  test "only registered adapters are accepted" do
-    assert_raises(NameError) do
-      ActionSystemTest.driver = :whatever
-    end
-
-    assert_nothing_raised do
-      ActionSystemTest.driver = :rack_test
-    end
-  end
-end
diff --git a/actionsystemtest/test/cases/driver_test.rb b/actionsystemtest/test/cases/driver_test.rb
new file mode 100644
index 0000000000..895aab4e45
--- /dev/null
+++ b/actionsystemtest/test/cases/driver_test.rb
@@ -0,0 +1,9 @@
+require "active_support/testing/autorun"
+require "action_system_test"
+
+class DriverTest < ActiveSupport::TestCase
+  test "initializing the driver" do
+    driver = ActionSystemTest::Driver.new(:selenium)
+    assert_equal :selenium, driver.instance_variable_get(:@name)
+  end
+end
diff --git a/actionsystemtest/test/cases/rails_selenium_driver_test.rb b/actionsystemtest/test/cases/rails_selenium_driver_test.rb
deleted file mode 100644
index 1a8e875f52..0000000000
--- a/actionsystemtest/test/cases/rails_selenium_driver_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "abstract_unit"
-
-class RailsSeleniumDriverTest < ActiveSupport::TestCase
-  def setup
-    ActionSystemTest.driver = :rails_selenium_driver
-  end
-
-  def test_default_driver_adapter
-    assert_kind_of ActionSystemTest::DriverAdapters::RailsSeleniumDriver, ActionSystemTest.driver
-  end
-end
diff --git a/actionsystemtest/test/cases/screenshot_helper_test.rb b/actionsystemtest/test/cases/screenshot_helper_test.rb
index 43b24cba21..d86bc4e62d 100644
--- a/actionsystemtest/test/cases/screenshot_helper_test.rb
+++ b/actionsystemtest/test/cases/screenshot_helper_test.rb
@@ -1,20 +1,10 @@
-require "abstract_unit"
+require "active_support/testing/autorun"
+require "action_system_test"
 
 class ScreenshotHelperTest < ActiveSupport::TestCase
-  def test_driver_support_for_screenshots
-    ActionSystemTest.driver = :rails_selenium_driver
-    assert ActionSystemTest.driver.supports_screenshots?
+  test "image path is saved in tmp directory" do
+    new_test = ActionSystemTest::Base.new("x")
 
-    ActionSystemTest.driver = :rack_test
-    assert_not ActionSystemTest.driver.supports_screenshots?
-
-    ActionSystemTest.driver = :selenium
-    assert ActionSystemTest.driver.supports_screenshots?
-
-    ActionSystemTest.driver = :webkit
-    assert ActionSystemTest.driver.supports_screenshots?
-
-    ActionSystemTest.driver = :poltergeist
-    assert ActionSystemTest.driver.supports_screenshots?
+    assert_equal "tmp/screenshots/failures_x.png", new_test.send(:image_path)
   end
 end
diff --git a/actionsystemtest/test/cases/server_test.rb b/actionsystemtest/test/cases/server_test.rb
new file mode 100644
index 0000000000..39a9be5026
--- /dev/null
+++ b/actionsystemtest/test/cases/server_test.rb
@@ -0,0 +1,9 @@
+require "active_support/testing/autorun"
+require "action_system_test"
+
+class ServerTest < ActiveSupport::TestCase
+  test "initializing the server port" do
+    server = ActionSystemTest::Server.new(21800)
+    assert_equal 21800, server.instance_variable_get(:@port)
+  end
+end