Merge branch '1337807-patch-1'

jfirebaugh · Aug 2, 2013 · 443af06 · 443af06
2 parents 1301ef9 + 9754f0e
commit 443af06
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -182,8 +182,8 @@ Konacha can be configured in an initializer, e.g. `config/initializers/konacha.r
 Konacha.configure do |config|
   config.spec_dir     = "spec/javascripts"
   config.spec_matcher = /_spec\.|_test\./
-  config.driver       = :selenium
   config.stylesheets  = %w(application)
+  config.driver       = :selenium
 end if defined?(Konacha)
 ```
 
@@ -192,13 +192,20 @@ environment.
 
 The `spec_dir` option tells Konacha where to find JavaScript specs.  `spec_matcher`
 is an object responding to `===` (most likely a `Regexp`); it receives a filename
-and should return true if the file is a spec. `driver` names a Capybara driver used
-for the `run` task (try `:poltergeist`, after installing
-[PhantomJS](https://github.com/jonleighton/poltergeist#installing-phantomjs)).
-The `stylesheets` option sets the stylesheets to be linked from the `<head>`
-of the test runner iframe.
+and should return true if the file is a spec. The `stylesheets` option sets the
+stylesheets to be linked from the `<head>` of the test runner iframe. `driver`
+names a Capybara driver used for the `run` task. The values above are the defaults.
 
-The values above are the defaults.
+For [PhantomJS](https://github.com/jonleighton/poltergeist#installing-phantomjs)
+support you can use the [poltergeist](https://github.com/jonleighton/poltergeist)
+driver. Require capybara/poltergeist in the configure block:
+
+```ruby
+Konacha.configure do |config|
+  require 'capybara/poltergeist'
+  config.driver = :poltergeist
+end if defined?(Konacha)
+```
 
 ## Test Interface and Assertions