Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing broken tests and update Rails dependency

  • Loading branch information...
commit bb4e627efc6af1d79189073169debf3e3bc5e9d8 1 parent 1d19331
@sikachu sikachu authored
View
29 Appraisals
@@ -1,19 +1,20 @@
-appraise "3.0.9" do
- gem "rails", "3.0.9"
+appraise '3.0.9' do
+ gem 'rails', '3.0.9'
end
-appraise "3.1.0" do
- gem "rails", "3.1.0"
- gem "sass"
- gem "coffee-script"
- gem "uglifier"
- gem "jquery-rails"
+appraise '3.1.3' do
+ gem 'rails', '3.1.3'
+ gem 'sass-rails', '~> 3.1.5'
+ gem 'coffee-rails', '~> 3.1.1'
+ gem 'uglifier', '>= 1.0.3'
+ gem 'jquery-rails'
+ gem 'turn', '~> 0.8.3'
end
-appraise "3.2.0" do
- gem "rails", "3.2.0"
- gem "sass"
- gem "coffee-script"
- gem "uglifier"
- gem "jquery-rails"
+appraise '3.2.1' do
+ gem 'rails', '3.2.1'
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
+ gem 'uglifier', '>= 1.0.3'
+ gem 'jquery-rails'
end
View
26 Gemfile.lock
@@ -51,18 +51,21 @@ GEM
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
- cucumber-rails (0.5.2)
- capybara (>= 1.0.0.rc1)
- cucumber (>= 0.10.5)
- nokogiri (>= 1.4.4)
- rack-test (>= 0.5.7)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (0.12.10)
ffi (1.0.11)
- gherkin (2.7.6)
+ formtastic (1.2.4)
+ actionpack (>= 2.3.7)
+ activesupport (>= 2.3.7)
+ i18n (~> 0.4)
+ gherkin (2.7.7)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
@@ -103,8 +106,8 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
- rubyzip (0.9.5)
- selenium-webdriver (2.18.0)
+ rubyzip (0.9.6.1)
+ selenium-webdriver (2.19.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
@@ -114,8 +117,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -135,10 +136,11 @@ PLATFORMS
DEPENDENCIES
appraisal (~> 0.4)
aruba
- cucumber-rails (~> 0.5.2)
+ cucumber-rails (~> 1.2.1)
database_cleaner
diesel!
+ formtastic (~> 1.2.3)
rspec-rails (~> 2.6.1)
- sqlite3-ruby
+ sqlite3
thin
turn
View
5 diesel.gemspec
@@ -19,14 +19,15 @@ Gem::Specification.new do |s|
s.add_dependency('railties')
- s.add_development_dependency('cucumber-rails', '~> 0.5.2')
+ s.add_development_dependency('cucumber-rails', '~> 1.2.1 ')
s.add_development_dependency('aruba')
s.add_development_dependency('appraisal', '~> 0.4')
s.add_development_dependency('rspec-rails', '~> 2.6.1')
s.add_development_dependency('thin')
- s.add_development_dependency('sqlite3-ruby')
+ s.add_development_dependency('sqlite3')
s.add_development_dependency('database_cleaner')
s.add_development_dependency('turn')
+ s.add_development_dependency('formtastic', '~> 1.2.3')
s.platform = Gem::Platform::RUBY
s.rubygems_version = %q{1.2.0}
View
8 features/features_generator.feature
@@ -59,6 +59,10 @@ Feature: reusable features generator
"""
When I write to "features/step_definitions/engine/example_steps.rb" with:
"""
+ When /^I go to the examples page$/ do
+ visit '/examples'
+ end
+
Then %{I should receive a warm greeting} do
page.should have_content("Hello there")
end
@@ -68,11 +72,11 @@ Feature: reusable features generator
And I cd to "testapp"
And I append to "Gemfile" with:
"""
- gem "capybara", "~> 1.0.0"
+ gem "capybara"
gem "rspec"
group :test do
gem "database_cleaner"
- gem "cucumber-rails", "~> 0.5.2"
+ gem "cucumber-rails", "~> 1.2.1"
end
"""
When I add the "testengine" as a diesel engine
View
1  features/rails_rake_tasks_and_generators.feature
@@ -22,6 +22,7 @@ Feature: use Rails rake tasks when developing a diesel application
"""
ENV["RAILS_ENV"] ||= 'test'
require "diesel/testing"
+ require 'test/unit'
require 'rspec/rails'
describe Post do
View
1  features/rspec_testing.feature
@@ -14,6 +14,7 @@ Feature: test a diesel engine using rspec
"""
ENV["RAILS_ENV"] ||= 'test'
require "diesel/testing"
+ require 'test/unit'
require 'rspec/rails'
describe ExampleController do
View
32 gemfiles/3.0.9.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/gabe/thoughtbot/diesel
+ remote: /Users/sikachu/Projects/diesel
specs:
diesel (0.1.5)
railties
@@ -63,11 +63,10 @@ GEM
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
- cucumber-rails (0.5.2)
- capybara (>= 1.0.0.rc1)
- cucumber (>= 0.10.5)
- nokogiri (>= 1.4.4)
- rack-test (>= 0.5.7)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
@@ -75,7 +74,11 @@ GEM
abstract (>= 1.0.0)
eventmachine (0.12.10)
ffi (1.0.11)
- gherkin (2.7.6)
+ formtastic (1.2.4)
+ actionpack (>= 2.3.7)
+ activesupport (>= 2.3.7)
+ i18n (~> 0.4)
+ gherkin (2.7.7)
json (>= 1.4.6)
i18n (0.5.0)
json (1.6.5)
@@ -85,7 +88,6 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- minitest (2.11.1)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
@@ -125,15 +127,13 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
- rubyzip (0.9.5)
- selenium-webdriver (2.18.0)
+ rubyzip (0.9.6.1)
+ selenium-webdriver (2.19.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -143,9 +143,8 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.9.1)
+ turn (0.9.2)
ansi
- minitest
tzinfo (0.3.31)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -156,11 +155,12 @@ PLATFORMS
DEPENDENCIES
appraisal (~> 0.4)
aruba
- cucumber-rails (~> 0.5.2)
+ cucumber-rails (~> 1.2.1)
database_cleaner
diesel!
+ formtastic (~> 1.2.3)
rails (= 3.0.9)
rspec-rails (~> 2.6.1)
- sqlite3-ruby
+ sqlite3
thin
turn
View
11 gemfiles/3.1.0.gemfile
@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.1.0"
-gem "sass"
-gem "coffee-script"
-gem "uglifier"
-gem "jquery-rails"
-
-gemspec :path=>"../"
View
12 gemfiles/3.1.3.gemfile
@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.1.3"
+gem "sass-rails", "~> 3.1.5"
+gem "coffee-rails", "~> 3.1.1"
+gem "uglifier", ">= 1.0.3"
+gem "jquery-rails"
+gem "turn", "~> 0.8.3"
+
+gemspec :path=>"../"
View
110 gemfiles/3.1.0.gemfile.lock → gemfiles/3.1.3.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/gabe/thoughtbot/diesel
+ remote: /Users/sikachu/Projects/diesel
specs:
diesel (0.1.5)
railties
@@ -7,34 +7,33 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
multi_json (~> 1.0)
ansi (1.4.2)
appraisal (0.4.0)
@@ -49,7 +48,6 @@ GEM
rspec (>= 2.6.0)
bcat (0.6.2)
rack (~> 1.0)
- bcrypt-ruby (3.0.1)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -60,6 +58,9 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.1)
ffi (~> 1.0.6)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -70,11 +71,10 @@ GEM
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
- cucumber-rails (0.5.2)
- capybara (>= 1.0.0.rc1)
- cucumber (>= 0.10.5)
- nokogiri (>= 1.4.4)
- rack-test (>= 0.5.7)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
@@ -83,7 +83,11 @@ GEM
execjs (1.3.0)
multi_json (~> 1.0)
ffi (1.0.11)
- gherkin (2.7.6)
+ formtastic (1.2.4)
+ actionpack (>= 2.3.7)
+ activesupport (>= 2.3.7)
+ i18n (~> 0.4)
+ gherkin (2.7.7)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
@@ -96,12 +100,11 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- minitest (2.11.1)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
rack (1.3.6)
- rack-cache (1.0.3)
+ rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
@@ -109,17 +112,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.3)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -141,9 +144,14 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
- rubyzip (0.9.5)
- sass (3.1.14)
- selenium-webdriver (2.18.0)
+ rubyzip (0.9.6.1)
+ sass (3.1.15)
+ sass-rails (3.1.5)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (~> 3.1.10)
+ tilt (~> 1.3.2)
+ selenium-webdriver (2.19.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
@@ -153,8 +161,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -165,9 +171,8 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.9.1)
+ turn (0.8.3)
ansi
- minitest
tzinfo (0.3.31)
uglifier (1.2.3)
execjs (>= 0.3.0)
@@ -181,15 +186,16 @@ PLATFORMS
DEPENDENCIES
appraisal (~> 0.4)
aruba
- coffee-script
- cucumber-rails (~> 0.5.2)
+ coffee-rails (~> 3.1.1)
+ cucumber-rails (~> 1.2.1)
database_cleaner
diesel!
+ formtastic (~> 1.2.3)
jquery-rails
- rails (= 3.1.0)
+ rails (= 3.1.3)
rspec-rails (~> 2.6.1)
- sass
- sqlite3-ruby
+ sass-rails (~> 3.1.5)
+ sqlite3
thin
- turn
- uglifier
+ turn (~> 0.8.3)
+ uglifier (>= 1.0.3)
View
11 gemfiles/3.2.0.gemfile
@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.2.0"
-gem "sass"
-gem "coffee-script"
-gem "uglifier"
-gem "jquery-rails"
-
-gemspec :path=>"../"
View
11 gemfiles/3.2.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.2.1"
+gem "sass-rails", "~> 3.2.3"
+gem "coffee-rails", "~> 3.2.1"
+gem "uglifier", ">= 1.0.3"
+gem "jquery-rails"
+
+gemspec :path=>"../"
View
99 gemfiles/3.2.0.gemfile.lock → gemfiles/3.2.1.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/gabe/thoughtbot/diesel
+ remote: /Users/sikachu/Projects/diesel
specs:
diesel (0.1.5)
railties
@@ -7,31 +7,31 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.0)
- actionpack (= 3.2.0)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
mail (~> 2.4.0)
- actionpack (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0)
+ journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- activerecord (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- activesupport (3.2.0)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
ansi (1.4.2)
@@ -57,6 +57,9 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.1)
ffi (~> 1.0.6)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -67,11 +70,10 @@ GEM
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
- cucumber-rails (0.5.2)
- capybara (>= 1.0.0.rc1)
- cucumber (>= 0.10.5)
- nokogiri (>= 1.4.4)
- rack-test (>= 0.5.7)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
@@ -80,7 +82,11 @@ GEM
execjs (1.3.0)
multi_json (~> 1.0)
ffi (1.0.11)
- gherkin (2.7.6)
+ formtastic (1.2.4)
+ actionpack (>= 2.3.7)
+ activesupport (>= 2.3.7)
+ i18n (~> 0.4)
+ gherkin (2.7.7)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
@@ -94,7 +100,6 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- minitest (2.11.1)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
@@ -105,17 +110,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.0)
- actionmailer (= 3.2.0)
- actionpack (= 3.2.0)
- activerecord (= 3.2.0)
- activeresource (= 3.2.0)
- activesupport (= 3.2.0)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.2.0)
- railties (3.2.0)
- actionpack (= 3.2.0)
- activesupport (= 3.2.0)
+ railties (= 3.2.1)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -137,9 +142,13 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
- rubyzip (0.9.5)
- sass (3.1.14)
- selenium-webdriver (2.18.0)
+ rubyzip (0.9.6.1)
+ sass (3.1.15)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ selenium-webdriver (2.19.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
@@ -149,8 +158,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -161,9 +168,8 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.9.1)
+ turn (0.9.2)
ansi
- minitest
tzinfo (0.3.31)
uglifier (1.2.3)
execjs (>= 0.3.0)
@@ -177,15 +183,16 @@ PLATFORMS
DEPENDENCIES
appraisal (~> 0.4)
aruba
- coffee-script
- cucumber-rails (~> 0.5.2)
+ coffee-rails (~> 3.2.1)
+ cucumber-rails (~> 1.2.1)
database_cleaner
diesel!
+ formtastic (~> 1.2.3)
jquery-rails
- rails (= 3.2.0)
+ rails (= 3.2.1)
rspec-rails (~> 2.6.1)
- sass
- sqlite3-ruby
+ sass-rails (~> 3.2.3)
+ sqlite3
thin
turn
- uglifier
+ uglifier (>= 1.0.3)
View
1  lib/diesel/testing/application.rb
@@ -13,6 +13,7 @@ class Application < Rails::Application
config.paths['app/controllers'] << "#{APP_ROOT}/app/controllers"
config.paths['app/views'] << "#{APP_ROOT}/app/views"
config.paths['log'] = "tmp/log/development.log"
+ config.assets.enabled = true
else
config.paths.config.database = "#{APP_ROOT}/config/database.yml"
config.paths.config.routes << "#{APP_ROOT}/config/routes.rb"
Please sign in to comment.
Something went wrong with that request. Please try again.