Add missing test dependences to Appraisals
Since as of commit 2748b75087, we no
longer install dependencies inside of the Rails app that is generated
and used to run all of the tests, we have to require all of the
dependencies that the app would install inside of the appropriate
Appraisals.
This was mostly straightforward except for some workarounds with the
turn gem:
* Rails 3.1 requires two versions of turn depending on which Ruby
version you're using. On 1.9.2, it uses turn 0.9.2; after 1.9.2, it
uses ~> 0.9.3. To accommodate this we have to have two versions of the
Rails 3.1 appraisal which declare the different turn versions.
* Rails 3.1 also loads the turn gem even if, in the Gemfile for the app,
turn is declared with `require: false`. This causes a problem while
running our tests because turn actually requires minitest/autorun,
which adds a hook so when Ruby exits, Minitest tests are run. Because
we're already using RSpec, Minitest will try to re-run the `rspec`
command we ran within a Minitest environment. This will fail since we
are using RSpec-specific command line options to run the tests.
Unfortunately there's no way to shut off minitest/autorun after it's
been required, so we have to monkey-patch Minitest's #run method so
it's a no-op.
This commit is contained in:
Elliot Winkler
parent
380d18f062
commit
f13e069f09
|
|
@ -16,6 +16,8 @@ matrix:
|
|||
- rvm: rbx-19mode
|
||||
- rvm: jruby-19mode
|
||||
include:
|
||||
- rvm: 1.9.2
|
||||
gemfile: gemfiles/3.1_1.9.2.gemfile
|
||||
- rvm: 1.9.3
|
||||
gemfile: gemfiles/4.0.0.gemfile
|
||||
- rvm: 1.9.3
|
||||
|
|
@ -34,3 +36,6 @@ matrix:
|
|||
gemfile: gemfiles/3.2.gemfile
|
||||
- rvm: jruby-19mode
|
||||
gemfile: gemfiles/3.2.gemfile
|
||||
exclude:
|
||||
- rvm: 1.9.2
|
||||
gemfile: gemfiles/3.1.gemfile
|
||||
|
|
|
|||
90
Appraisals
90
Appraisals
|
|
@ -1,5 +1,26 @@
|
|||
rails_4_0 = proc do
|
||||
ruby_version = Gem::Version.new(RUBY_VERSION + '')
|
||||
|
||||
rails_3 = proc do
|
||||
gem 'strong_parameters'
|
||||
end
|
||||
|
||||
rails_3_1 = proc do
|
||||
instance_eval(&rails_3)
|
||||
gem 'rails', '~> 3.1.8'
|
||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
gem 'jquery-rails'
|
||||
gem 'sass-rails', '~> 3.1.5'
|
||||
gem 'coffee-rails', '~> 3.1.1'
|
||||
gem 'uglifier', '>= 1.0.3'
|
||||
end
|
||||
|
||||
rails_4 = proc do
|
||||
gem 'uglifier', '>= 1.3.0'
|
||||
gem 'coffee-rails', '~> 4.0.0'
|
||||
gem 'jquery-rails'
|
||||
gem 'turbolinks'
|
||||
gem 'jbuilder', '~> 1.2'
|
||||
gem 'sdoc'
|
||||
gem 'activeresource', '4.0.0'
|
||||
# Test suite makes heavy use of attr_accessible
|
||||
gem 'protected_attributes'
|
||||
|
|
@ -7,47 +28,58 @@ end
|
|||
|
||||
#---
|
||||
|
||||
if RUBY_VERSION < '2.0'
|
||||
if Gem::Requirement.new('< 2').satisfied_by?(ruby_version)
|
||||
appraise '3.0' do
|
||||
instance_eval(&rails_3)
|
||||
gem 'rails', '~> 3.0.17'
|
||||
gem 'strong_parameters'
|
||||
end
|
||||
|
||||
appraise '3.1' do
|
||||
gem 'rails', '~> 3.1.8'
|
||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
gem 'jquery-rails'
|
||||
gem 'sass-rails'
|
||||
gem 'strong_parameters'
|
||||
if Gem::Requirement.new('= 1.9.2').satisfied_by?(ruby_version)
|
||||
appraise '3.1-1.9.2' do
|
||||
instance_eval(&rails_3_1)
|
||||
gem 'turn', '0.8.2'
|
||||
end
|
||||
else
|
||||
appraise '3.1' do
|
||||
instance_eval(&rails_3_1)
|
||||
gem 'turn', '~> 0.8.3'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
appraise '3.2' do
|
||||
instance_eval(&rails_3)
|
||||
gem 'rails', '~> 3.2.13'
|
||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
gem 'jquery-rails'
|
||||
gem 'sass-rails'
|
||||
gem 'strong_parameters'
|
||||
gem 'sass-rails', '~> 3.2.3'
|
||||
gem 'coffee-rails', '~> 3.2.1'
|
||||
gem 'uglifier', '>= 1.0.3'
|
||||
end
|
||||
|
||||
appraise '4.0.0' do
|
||||
instance_eval(&rails_4_0)
|
||||
gem 'rails', '4.0.0'
|
||||
gem 'sass-rails', '4.0.0'
|
||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
end
|
||||
if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
|
||||
appraise '4.0.0' do
|
||||
instance_eval(&rails_4)
|
||||
gem 'rails', '4.0.0'
|
||||
gem 'sass-rails', '~> 4.0.0'
|
||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
end
|
||||
|
||||
appraise '4.0.1' do
|
||||
instance_eval(&rails_4_0)
|
||||
gem 'rails', '4.0.1'
|
||||
gem 'sass-rails', '4.0.1'
|
||||
gem 'bcrypt-ruby', '~> 3.1.2'
|
||||
end
|
||||
appraise '4.0.1' do
|
||||
instance_eval(&rails_4)
|
||||
gem 'rails', '4.0.1'
|
||||
gem 'sass-rails', '~> 4.0.0'
|
||||
gem 'bcrypt-ruby', '~> 3.1.2'
|
||||
end
|
||||
|
||||
appraise '4.1' do
|
||||
instance_eval(&rails_4_0)
|
||||
gem 'rails', '~> 4.1.0'
|
||||
gem 'sass-rails', '4.0.3'
|
||||
gem 'bcrypt-ruby', '~> 3.1.2'
|
||||
gem "protected_attributes", '~> 1.0.6'
|
||||
appraise '4.1' do
|
||||
instance_eval(&rails_4)
|
||||
gem 'rails', '~> 4.1.0'
|
||||
gem 'jbuilder', '~> 2.0'
|
||||
gem 'sass-rails', '~> 4.0.3'
|
||||
gem 'sdoc', '~> 0.4.0'
|
||||
gem 'bcrypt', '~> 3.1.7'
|
||||
gem 'protected_attributes', "~> 1.0.6"
|
||||
gem 'spring'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
|||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "rails", "~> 3.0.17"
|
||||
gem "strong_parameters"
|
||||
gem "rails", "~> 3.0.17"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
|
|||
|
|
@ -9,10 +9,13 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
|||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "strong_parameters"
|
||||
gem "rails", "~> 3.1.8"
|
||||
gem "bcrypt-ruby", "~> 3.0.0"
|
||||
gem "jquery-rails"
|
||||
gem "sass-rails"
|
||||
gem "strong_parameters"
|
||||
gem "sass-rails", "~> 3.1.5"
|
||||
gem "coffee-rails", "~> 3.1.1"
|
||||
gem "uglifier", ">= 1.0.3"
|
||||
gem "turn", "~> 0.8.3"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ GEM
|
|||
activesupport (= 3.1.11)
|
||||
activesupport (3.1.11)
|
||||
multi_json (~> 1.0)
|
||||
ansi (1.4.3)
|
||||
appraisal (1.0.0.beta2)
|
||||
bundler
|
||||
rake
|
||||
|
|
@ -51,6 +52,13 @@ GEM
|
|||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (3.1.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.1.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.2.3)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
|
|
@ -58,6 +66,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
diff-lcs (1.2.1)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.4.0)
|
||||
gherkin (2.11.6)
|
||||
json (>= 1.7.6)
|
||||
|
|
@ -142,7 +151,12 @@ GEM
|
|||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turn (0.8.3)
|
||||
ansi
|
||||
tzinfo (0.3.37)
|
||||
uglifier (2.2.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -155,6 +169,7 @@ DEPENDENCIES
|
|||
bcrypt-ruby (~> 3.0.0)
|
||||
bourne (~> 1.3)
|
||||
bundler (~> 1.1)
|
||||
coffee-rails (~> 3.1.1)
|
||||
cucumber (~> 1.1)
|
||||
jdbc-sqlite3
|
||||
jquery-rails
|
||||
|
|
@ -163,9 +178,11 @@ DEPENDENCIES
|
|||
rails (~> 3.1.8)
|
||||
rake (>= 0.9.2)
|
||||
rspec-rails (>= 2.13.1, < 3)
|
||||
sass-rails
|
||||
sass-rails (~> 3.1.5)
|
||||
shoulda-context (~> 1.2.0)
|
||||
shoulda-matchers!
|
||||
sqlite3
|
||||
strong_parameters
|
||||
therubyrhino
|
||||
turn (~> 0.8.3)
|
||||
uglifier (>= 1.0.3)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
# This file was generated by Appraisal
|
||||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "shoulda-context", "~> 1.2.0"
|
||||
gem "sqlite3", :platform=>:ruby
|
||||
gem "activerecord-jdbc-adapter", :platform=>:jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
||||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "strong_parameters"
|
||||
gem "rails", "~> 3.1.8"
|
||||
gem "bcrypt-ruby", "~> 3.0.0"
|
||||
gem "jquery-rails"
|
||||
gem "sass-rails", "~> 3.1.5"
|
||||
gem "coffee-rails", "~> 3.1.1"
|
||||
gem "uglifier", ">= 1.0.3"
|
||||
gem "turn", "0.8.2"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
PATH
|
||||
remote: .././
|
||||
specs:
|
||||
shoulda-matchers (2.6.1)
|
||||
activesupport (>= 3.0.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.1.11)
|
||||
actionpack (= 3.1.11)
|
||||
mail (~> 2.3.3)
|
||||
actionpack (3.1.11)
|
||||
activemodel (= 3.1.11)
|
||||
activesupport (= 3.1.11)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
i18n (~> 0.6)
|
||||
rack (~> 1.3.6)
|
||||
rack-cache (~> 1.2)
|
||||
rack-mount (~> 0.8.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.0.4)
|
||||
activemodel (3.1.11)
|
||||
activesupport (= 3.1.11)
|
||||
builder (~> 3.0.0)
|
||||
i18n (~> 0.6)
|
||||
activerecord (3.1.11)
|
||||
activemodel (= 3.1.11)
|
||||
activesupport (= 3.1.11)
|
||||
arel (~> 2.2.3)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.1.11)
|
||||
activemodel (= 3.1.11)
|
||||
activesupport (= 3.1.11)
|
||||
activesupport (3.1.11)
|
||||
multi_json (~> 1.0)
|
||||
ansi (1.4.3)
|
||||
appraisal (1.0.0.beta2)
|
||||
bundler
|
||||
rake
|
||||
thor (>= 0.14.0)
|
||||
arel (2.2.3)
|
||||
aruba (0.5.3)
|
||||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
bcrypt-ruby (3.0.1)
|
||||
bourne (1.5.0)
|
||||
mocha (>= 0.13.2, < 0.15)
|
||||
builder (3.0.4)
|
||||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (3.1.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.1.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.10)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.12)
|
||||
multi_json (>= 1.7.5, < 2.0)
|
||||
multi_test (>= 0.0.2)
|
||||
diff-lcs (1.2.5)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.9.3)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.9)
|
||||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
mail (2.3.3)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.1)
|
||||
method_source (0.8.2)
|
||||
mime-types (1.25.1)
|
||||
mocha (0.14.0)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.8.4)
|
||||
multi_test (0.0.3)
|
||||
polyglot (0.3.3)
|
||||
pry (0.9.12.6)
|
||||
coderay (~> 1.0)
|
||||
method_source (~> 0.8)
|
||||
slop (~> 3.4)
|
||||
rack (1.3.10)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
rack-mount (0.8.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-ssl (1.3.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (3.1.11)
|
||||
actionmailer (= 3.1.11)
|
||||
actionpack (= 3.1.11)
|
||||
activerecord (= 3.1.11)
|
||||
activeresource (= 3.1.11)
|
||||
activesupport (= 3.1.11)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.1.11)
|
||||
railties (3.1.11)
|
||||
actionpack (= 3.1.11)
|
||||
activesupport (= 3.1.11)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (~> 0.14.6)
|
||||
rake (10.1.1)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
rspec-core (2.14.7)
|
||||
rspec-expectations (2.14.4)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.14.4)
|
||||
rspec-rails (2.14.1)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 2.14.0)
|
||||
rspec-expectations (~> 2.14.0)
|
||||
rspec-mocks (~> 2.14.0)
|
||||
sass (3.2.12)
|
||||
sass-rails (3.1.6)
|
||||
actionpack (~> 3.1.0)
|
||||
railties (~> 3.1.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3.2)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.4.7)
|
||||
sprockets (2.0.4)
|
||||
hike (~> 1.2)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sqlite3 (1.3.8)
|
||||
strong_parameters (0.2.0)
|
||||
actionpack (~> 3.0)
|
||||
activemodel (~> 3.0)
|
||||
railties (~> 3.0)
|
||||
thor (0.14.6)
|
||||
tilt (1.3.6)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turn (0.8.2)
|
||||
ansi (>= 1.2.2)
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activerecord-jdbc-adapter
|
||||
activerecord-jdbcsqlite3-adapter
|
||||
appraisal (~> 1.0.0.beta2)
|
||||
aruba
|
||||
bcrypt-ruby (~> 3.0.0)
|
||||
bourne (~> 1.3)
|
||||
bundler (~> 1.1)
|
||||
coffee-rails (~> 3.1.1)
|
||||
cucumber (~> 1.1)
|
||||
jdbc-sqlite3
|
||||
jquery-rails
|
||||
jruby-openssl
|
||||
pry
|
||||
rails (~> 3.1.8)
|
||||
rake (>= 0.9.2)
|
||||
rspec-rails (>= 2.13.1, < 3)
|
||||
sass-rails (~> 3.1.5)
|
||||
shoulda-context (~> 1.2.0)
|
||||
shoulda-matchers!
|
||||
sqlite3
|
||||
strong_parameters
|
||||
therubyrhino
|
||||
turn (= 0.8.2)
|
||||
uglifier (>= 1.0.3)
|
||||
|
|
@ -9,10 +9,12 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
|||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "strong_parameters"
|
||||
gem "rails", "~> 3.2.13"
|
||||
gem "bcrypt-ruby", "~> 3.0.0"
|
||||
gem "jquery-rails"
|
||||
gem "sass-rails"
|
||||
gem "strong_parameters"
|
||||
gem "sass-rails", "~> 3.2.3"
|
||||
gem "coffee-rails", "~> 3.2.1"
|
||||
gem "uglifier", ">= 1.0.3"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
|
|||
|
|
@ -50,6 +50,13 @@ GEM
|
|||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.2.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.2.3)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
|
|
@ -57,6 +64,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
diff-lcs (1.2.1)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.4.0)
|
||||
gherkin (2.11.6)
|
||||
json (>= 1.7.6)
|
||||
|
|
@ -141,6 +149,9 @@ GEM
|
|||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (2.2.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -153,6 +164,7 @@ DEPENDENCIES
|
|||
bcrypt-ruby (~> 3.0.0)
|
||||
bourne (~> 1.3)
|
||||
bundler (~> 1.1)
|
||||
coffee-rails (~> 3.2.1)
|
||||
cucumber (~> 1.1)
|
||||
jdbc-sqlite3
|
||||
jquery-rails
|
||||
|
|
@ -161,9 +173,10 @@ DEPENDENCIES
|
|||
rails (~> 3.2.13)
|
||||
rake (>= 0.9.2)
|
||||
rspec-rails (>= 2.13.1, < 3)
|
||||
sass-rails
|
||||
sass-rails (~> 3.2.3)
|
||||
shoulda-context (~> 1.2.0)
|
||||
shoulda-matchers!
|
||||
sqlite3
|
||||
strong_parameters
|
||||
therubyrhino
|
||||
uglifier (>= 1.0.3)
|
||||
|
|
|
|||
|
|
@ -9,11 +9,16 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
|||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "uglifier", ">= 1.3.0"
|
||||
gem "coffee-rails", "~> 4.0.0"
|
||||
gem "jquery-rails"
|
||||
gem "turbolinks"
|
||||
gem "jbuilder", "~> 1.2"
|
||||
gem "sdoc"
|
||||
gem "activeresource", "4.0.0"
|
||||
gem "protected_attributes"
|
||||
gem "rails", "4.0.0"
|
||||
gem "sass-rails", "4.0.0"
|
||||
gem "sass-rails", "~> 4.0.0"
|
||||
gem "bcrypt-ruby", "~> 3.0.0"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
|
|||
|
|
@ -52,6 +52,13 @@ GEM
|
|||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.10)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
|
|
@ -60,14 +67,19 @@ GEM
|
|||
multi_test (>= 0.0.2)
|
||||
diff-lcs (1.2.5)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.9.3)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.5)
|
||||
jbuilder (1.5.3)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
|
@ -105,6 +117,8 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.1)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
rspec-core (2.14.7)
|
||||
rspec-expectations (2.14.4)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
|
|
@ -121,6 +135,9 @@ GEM
|
|||
railties (>= 4.0.0.beta, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
sdoc (0.4.0)
|
||||
json (~> 1.8)
|
||||
rdoc (~> 4.0, < 5.0)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.4.7)
|
||||
sprockets (2.10.1)
|
||||
|
|
@ -140,7 +157,12 @@ GEM
|
|||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.2.2)
|
||||
coffee-rails
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -154,7 +176,9 @@ DEPENDENCIES
|
|||
bcrypt-ruby (~> 3.0.0)
|
||||
bourne (~> 1.3)
|
||||
bundler (~> 1.1)
|
||||
coffee-rails (~> 4.0.0)
|
||||
cucumber (~> 1.1)
|
||||
jbuilder (~> 1.2)
|
||||
jdbc-sqlite3
|
||||
jquery-rails
|
||||
jruby-openssl
|
||||
|
|
@ -163,8 +187,11 @@ DEPENDENCIES
|
|||
rails (= 4.0.0)
|
||||
rake (>= 0.9.2)
|
||||
rspec-rails (>= 2.13.1, < 3)
|
||||
sass-rails (= 4.0.0)
|
||||
sass-rails (~> 4.0.0)
|
||||
sdoc
|
||||
shoulda-context (~> 1.2.0)
|
||||
shoulda-matchers!
|
||||
sqlite3
|
||||
therubyrhino
|
||||
turbolinks
|
||||
uglifier (>= 1.3.0)
|
||||
|
|
|
|||
|
|
@ -9,11 +9,16 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
|||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "uglifier", ">= 1.3.0"
|
||||
gem "coffee-rails", "~> 4.0.0"
|
||||
gem "jquery-rails"
|
||||
gem "turbolinks"
|
||||
gem "jbuilder", "~> 1.2"
|
||||
gem "sdoc"
|
||||
gem "activeresource", "4.0.0"
|
||||
gem "protected_attributes"
|
||||
gem "rails", "4.0.1"
|
||||
gem "sass-rails", "4.0.1"
|
||||
gem "sass-rails", "~> 4.0.0"
|
||||
gem "bcrypt-ruby", "~> 3.1.2"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
|
|||
|
|
@ -52,6 +52,13 @@ GEM
|
|||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.10)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
|
|
@ -60,14 +67,19 @@ GEM
|
|||
multi_test (>= 0.0.2)
|
||||
diff-lcs (1.2.5)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.9.3)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.5)
|
||||
jbuilder (1.5.3)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
|
@ -105,6 +117,8 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.1)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
rspec-core (2.14.7)
|
||||
rspec-expectations (2.14.4)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
|
|
@ -121,6 +135,9 @@ GEM
|
|||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
sdoc (0.4.0)
|
||||
json (~> 1.8)
|
||||
rdoc (~> 4.0, < 5.0)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.4.7)
|
||||
sprockets (2.10.1)
|
||||
|
|
@ -140,7 +157,12 @@ GEM
|
|||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.2.2)
|
||||
coffee-rails
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -154,7 +176,9 @@ DEPENDENCIES
|
|||
bcrypt-ruby (~> 3.1.2)
|
||||
bourne (~> 1.3)
|
||||
bundler (~> 1.1)
|
||||
coffee-rails (~> 4.0.0)
|
||||
cucumber (~> 1.1)
|
||||
jbuilder (~> 1.2)
|
||||
jdbc-sqlite3
|
||||
jquery-rails
|
||||
jruby-openssl
|
||||
|
|
@ -163,8 +187,11 @@ DEPENDENCIES
|
|||
rails (= 4.0.1)
|
||||
rake (>= 0.9.2)
|
||||
rspec-rails (>= 2.13.1, < 3)
|
||||
sass-rails (= 4.0.1)
|
||||
sass-rails (~> 4.0.0)
|
||||
sdoc
|
||||
shoulda-context (~> 1.2.0)
|
||||
shoulda-matchers!
|
||||
sqlite3
|
||||
therubyrhino
|
||||
turbolinks
|
||||
uglifier (>= 1.3.0)
|
||||
|
|
|
|||
|
|
@ -9,11 +9,17 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
|
|||
gem "jdbc-sqlite3", :platform=>:jruby
|
||||
gem "jruby-openssl", :platform=>:jruby
|
||||
gem "therubyrhino", :platform=>:jruby
|
||||
gem "uglifier", ">= 1.3.0"
|
||||
gem "coffee-rails", "~> 4.0.0"
|
||||
gem "jquery-rails"
|
||||
gem "turbolinks"
|
||||
gem "activeresource", "4.0.0"
|
||||
gem "rails", "~> 4.1.0"
|
||||
gem "sass-rails", "4.0.3"
|
||||
gem "bcrypt-ruby", "~> 3.1.2"
|
||||
gem "jbuilder", "~> 2.0"
|
||||
gem "sass-rails", "~> 4.0.3"
|
||||
gem "sdoc", "~> 0.4.0"
|
||||
gem "bcrypt", "~> 3.1.7"
|
||||
gem "protected_attributes", "~> 1.0.6"
|
||||
gem "spring"
|
||||
|
||||
gemspec :path=>".././"
|
||||
|
|
|
|||
|
|
@ -46,13 +46,20 @@ GEM
|
|||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
bcrypt-ruby (3.1.2)
|
||||
bcrypt (3.1.7)
|
||||
bourne (1.5.0)
|
||||
mocha (>= 0.13.2, < 0.15)
|
||||
builder (3.2.2)
|
||||
childprocess (0.4.0)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.10)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
|
|
@ -61,11 +68,15 @@ GEM
|
|||
multi_test (>= 0.0.2)
|
||||
diff-lcs (1.2.5)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
ffi (1.9.3)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.9)
|
||||
jbuilder (2.0.6)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (3.1.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
|
|
@ -109,6 +120,8 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.2.2)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
rspec-core (2.14.7)
|
||||
rspec-expectations (2.14.4)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
|
|
@ -127,8 +140,12 @@ GEM
|
|||
sass (~> 3.2.0)
|
||||
sprockets (~> 2.8, <= 2.11.0)
|
||||
sprockets-rails (~> 2.0)
|
||||
sdoc (0.4.0)
|
||||
json (~> 1.8)
|
||||
rdoc (~> 4.0, < 5.0)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.4.7)
|
||||
spring (1.1.2)
|
||||
sprockets (2.11.0)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -145,8 +162,13 @@ GEM
|
|||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.2.2)
|
||||
coffee-rails
|
||||
tzinfo (1.1.0)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -157,10 +179,12 @@ DEPENDENCIES
|
|||
activeresource (= 4.0.0)
|
||||
appraisal (~> 1.0.0.beta2)
|
||||
aruba
|
||||
bcrypt-ruby (~> 3.1.2)
|
||||
bcrypt (~> 3.1.7)
|
||||
bourne (~> 1.3)
|
||||
bundler (~> 1.1)
|
||||
coffee-rails (~> 4.0.0)
|
||||
cucumber (~> 1.1)
|
||||
jbuilder (~> 2.0)
|
||||
jdbc-sqlite3
|
||||
jquery-rails
|
||||
jruby-openssl
|
||||
|
|
@ -169,8 +193,12 @@ DEPENDENCIES
|
|||
rails (~> 4.1.0)
|
||||
rake (>= 0.9.2)
|
||||
rspec-rails (>= 2.13.1, < 3)
|
||||
sass-rails (= 4.0.3)
|
||||
sass-rails (~> 4.0.3)
|
||||
sdoc (~> 0.4.0)
|
||||
shoulda-context (~> 1.2.0)
|
||||
shoulda-matchers!
|
||||
spring
|
||||
sqlite3
|
||||
therubyrhino
|
||||
turbolinks
|
||||
uglifier (>= 1.3.0)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,24 @@
|
|||
require File.expand_path('../support/test_application', __FILE__)
|
||||
|
||||
def monkey_patch_minitest_to_do_nothing
|
||||
# Rails 3.1's test_help file requires Turn, which loads Minitest in autorun
|
||||
# mode. This means that Minitest tests will run after these RSpec tests are
|
||||
# finished running. This will break on CI since we pass --color to the `rspec`
|
||||
# command.
|
||||
|
||||
if defined?(MiniTest)
|
||||
MiniTest::Unit.class_eval do
|
||||
def run(*); end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
$test_app = TestApplication.new
|
||||
$test_app.create
|
||||
$test_app.load
|
||||
|
||||
monkey_patch_minitest_to_do_nothing
|
||||
|
||||
ENV['BUNDLE_GEMFILE'] ||= app.gemfile_path
|
||||
ENV['RAILS_ENV'] = 'test'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue