Remove broken envjs and tweak cucumber environment

This commit is contained in:
Jacques Crocker 2010-07-31 01:27:21 -07:00
parent 5d8a0819e9
commit 0607be09ab
6 changed files with 15 additions and 18 deletions

View File

@ -47,7 +47,10 @@ group :test do
gem "pickle", :git => "http://github.com/codegram/pickle.git" gem "pickle", :git => "http://github.com/codegram/pickle.git"
gem "pickle-mongoid" gem "pickle-mongoid"
gem 'capybara' gem 'capybara'
gem "capybara-envjs", ">= 0.1.5"
# would be nice..
# gem "capybara-envjs"
gem 'database_cleaner' gem 'database_cleaner'
gem 'cucumber' gem 'cucumber'
gem 'cucumber-rails' gem 'cucumber-rails'

View File

@ -90,9 +90,6 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3) selenium-webdriver (>= 0.0.3)
capybara-envjs (0.1.6)
capybara (>= 0.3.9)
envjs (>= 0.3.7)
carrierwave (0.5.0.beta2) carrierwave (0.5.0.beta2)
activesupport (>= 3.0.0.beta4) activesupport (>= 3.0.0.beta4)
cgi_multipart_eof_fix (2.5.0) cgi_multipart_eof_fix (2.5.0)
@ -111,8 +108,6 @@ GEM
daemons (1.1.0) daemons (1.1.0)
database_cleaner (0.5.2) database_cleaner (0.5.2)
diff-lcs (1.1.2) diff-lcs (1.1.2)
envjs (0.3.7)
johnson (>= 2.0.0.pre3)
erubis (2.6.6) erubis (2.6.6)
abstract (>= 1.0.0) abstract (>= 1.0.0)
factory_girl (1.3.1) factory_girl (1.3.1)
@ -145,8 +140,6 @@ GEM
gemcutter (>= 0.1.0) gemcutter (>= 0.1.0)
git (>= 1.2.5) git (>= 1.2.5)
rubyforge (>= 2.0.0) rubyforge (>= 2.0.0)
johnson (2.0.0.pre3)
stackdeck (~> 0.2)
json_pure (1.4.3) json_pure (1.4.3)
launchy (0.3.7) launchy (0.3.7)
configuration (>= 0.0.5) configuration (>= 0.0.5)
@ -223,7 +216,6 @@ GEM
json_pure json_pure
rubyzip rubyzip
spork (0.8.4) spork (0.8.4)
stackdeck (0.2.0)
term-ansicolor (1.0.5) term-ansicolor (1.0.5)
thor (0.14.0) thor (0.14.0)
treetop (1.4.8) treetop (1.4.8)
@ -250,7 +242,6 @@ DEPENDENCIES
aws aws
bson_ext (>= 1.0.1) bson_ext (>= 1.0.1)
capybara capybara
capybara-envjs (>= 0.1.5)
carrierwave (= 0.5.0.beta2) carrierwave (= 0.5.0.beta2)
cgi_multipart_eof_fix cgi_multipart_eof_fix
cucumber cucumber

View File

@ -3,11 +3,11 @@ General Cucumbering Strategy:
Admin Pages Admin Pages
Contents Contents
Pages Pages
- Create a Page - Create a Page (DONE)
- Create a Sub Page - Create a Sub Page
- Create another Sub Page - Create another Sub Page
- Move Sub Pages around (use Selenium for this) - Move Sub Pages around (use Selenium for this)
- Edit a Page - Edit a Page (DONE)
- Delete a Page - Delete a Page
Models Models
- Create a New Model - Create a New Model

View File

@ -28,4 +28,4 @@ Scenario: Updating a valid page
And I fill in "Body" with "My new content is here" And I fill in "Body" with "My new content is here"
And I press "Update" And I press "Update"
Then I should see "Page was successfully updated." Then I should see "Page was successfully updated."
And I should have "My new content is here" in the index page layout And I should have "My new content is here" in the index page layout

View File

@ -20,8 +20,8 @@ end
Given /^I am an authenticated user$/ do Given /^I am an authenticated user$/ do
Given %{I go to login} Given %{I go to login}
And %{I fill in "admin_email" with "admin@locomotiveapp.org"} And %{I fill in "Email" with "admin@locomotiveapp.org"}
And %{I fill in "admin_password" with "easyone"} And %{I fill in "Password" with "easyone"}
And %{I press "Log in"} And %{I press "Log in"}
end end

View File

@ -16,14 +16,16 @@ require 'capybara/rails'
require 'capybara/cucumber' require 'capybara/cucumber'
require 'capybara/session' require 'capybara/session'
require 'capybara/envjs' # envjs doesnt work at the moment
# require 'capybara/envjs'
# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
# order to ease the transition to Capybara we set the default here. If you'd # order to ease the transition to Capybara we set the default here. If you'd
# prefer to use XPath just remove this line and adjust any selectors in your # prefer to use XPath just remove this line and adjust any selectors in your
# steps to use the XPath syntax. # steps to use the XPath syntax.
Capybara.default_selector = :css Capybara.default_selector = :css
Capybara.javascript_driver = :envjs
Capybara.javascript_driver = :selenium
# If you set this to false, any error raised from within your app will bubble # If you set this to false, any error raised from within your app will bubble
# up to your step definition and out to cucumber unless you catch it somewhere # up to your step definition and out to cucumber unless you catch it somewhere
@ -40,4 +42,5 @@ Locomotive.configure do |config|
config.default_domain = 'example.com' config.default_domain = 'example.com'
end end
Capybara.default_host = 'test.example.com' Capybara.default_host = 'test.example.com'
# Capybara.app_host = 'http://test.example.com'