The specs failed on Travis.
This commit is contained in:
parent
d29dfef1c0
commit
77a06d0e27
157
Gemfile.lock
157
Gemfile.lock
|
@ -1,97 +1,114 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
abstract (1.0.0)
|
actionmailer (3.1.3)
|
||||||
actionmailer (3.0.8)
|
actionpack (= 3.1.3)
|
||||||
actionpack (= 3.0.8)
|
mail (~> 2.3.0)
|
||||||
mail (~> 2.2.19)
|
actionpack (3.1.3)
|
||||||
actionpack (3.0.8)
|
activemodel (= 3.1.3)
|
||||||
activemodel (= 3.0.8)
|
activesupport (= 3.1.3)
|
||||||
activesupport (= 3.0.8)
|
builder (~> 3.0.0)
|
||||||
builder (~> 2.1.2)
|
erubis (~> 2.7.0)
|
||||||
erubis (~> 2.6.6)
|
i18n (~> 0.6)
|
||||||
i18n (~> 0.5.0)
|
rack (~> 1.3.5)
|
||||||
rack (~> 1.2.1)
|
rack-cache (~> 1.1)
|
||||||
rack-mount (~> 0.6.14)
|
rack-mount (~> 0.8.2)
|
||||||
rack-test (~> 0.5.7)
|
rack-test (~> 0.6.1)
|
||||||
tzinfo (~> 0.3.23)
|
sprockets (~> 2.0.3)
|
||||||
activemodel (3.0.8)
|
activemodel (3.1.3)
|
||||||
activesupport (= 3.0.8)
|
activesupport (= 3.1.3)
|
||||||
builder (~> 2.1.2)
|
builder (~> 3.0.0)
|
||||||
i18n (~> 0.5.0)
|
i18n (~> 0.6)
|
||||||
activerecord (3.0.8)
|
activerecord (3.1.3)
|
||||||
activemodel (= 3.0.8)
|
activemodel (= 3.1.3)
|
||||||
activesupport (= 3.0.8)
|
activesupport (= 3.1.3)
|
||||||
arel (~> 2.0.10)
|
arel (~> 2.2.1)
|
||||||
tzinfo (~> 0.3.23)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.0.8)
|
activeresource (3.1.3)
|
||||||
activemodel (= 3.0.8)
|
activemodel (= 3.1.3)
|
||||||
activesupport (= 3.0.8)
|
activesupport (= 3.1.3)
|
||||||
activesupport (3.0.8)
|
activesupport (3.1.3)
|
||||||
arel (2.0.10)
|
multi_json (~> 1.0)
|
||||||
builder (2.1.2)
|
arel (2.2.1)
|
||||||
diff-lcs (1.1.2)
|
builder (3.0.0)
|
||||||
erubis (2.6.6)
|
diff-lcs (1.1.3)
|
||||||
abstract (>= 1.0.0)
|
erubis (2.7.0)
|
||||||
generator_spec (0.8.3)
|
generator_spec (0.8.4)
|
||||||
rails (~> 3.0)
|
rails (>= 3.0, < 4.0)
|
||||||
rspec-rails
|
rspec-rails
|
||||||
git (1.2.5)
|
git (1.2.5)
|
||||||
i18n (0.5.0)
|
hike (1.2.1)
|
||||||
|
i18n (0.6.0)
|
||||||
jeweler (1.6.4)
|
jeweler (1.6.4)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
git (>= 1.2.5)
|
git (>= 1.2.5)
|
||||||
rake
|
rake
|
||||||
json_pure (1.5.2)
|
json (1.6.3)
|
||||||
mail (2.2.19)
|
json_pure (1.6.3)
|
||||||
activesupport (>= 2.3.6)
|
mail (2.3.0)
|
||||||
i18n (>= 0.4.0)
|
i18n (>= 0.4.0)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.16)
|
mime-types (1.17.2)
|
||||||
polyglot (0.3.1)
|
multi_json (1.0.4)
|
||||||
rack (1.2.3)
|
polyglot (0.3.3)
|
||||||
rack-mount (0.6.14)
|
rack (1.3.5)
|
||||||
|
rack-cache (1.1)
|
||||||
|
rack (>= 0.4)
|
||||||
|
rack-mount (0.8.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (0.5.7)
|
rack-ssl (1.3.2)
|
||||||
|
rack
|
||||||
|
rack-test (0.6.1)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.0.8)
|
rails (3.1.3)
|
||||||
actionmailer (= 3.0.8)
|
actionmailer (= 3.1.3)
|
||||||
actionpack (= 3.0.8)
|
actionpack (= 3.1.3)
|
||||||
activerecord (= 3.0.8)
|
activerecord (= 3.1.3)
|
||||||
activeresource (= 3.0.8)
|
activeresource (= 3.1.3)
|
||||||
activesupport (= 3.0.8)
|
activesupport (= 3.1.3)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.0.8)
|
railties (= 3.1.3)
|
||||||
railties (3.0.8)
|
railties (3.1.3)
|
||||||
actionpack (= 3.0.8)
|
actionpack (= 3.1.3)
|
||||||
activesupport (= 3.0.8)
|
activesupport (= 3.1.3)
|
||||||
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (~> 0.14.4)
|
rdoc (~> 3.4)
|
||||||
rake (0.9.2)
|
thor (~> 0.14.6)
|
||||||
rspec (2.6.0)
|
rake (0.9.2.2)
|
||||||
rspec-core (~> 2.6.0)
|
rdoc (3.11)
|
||||||
rspec-expectations (~> 2.6.0)
|
json (~> 1.4)
|
||||||
rspec-mocks (~> 2.6.0)
|
rspec (2.7.0)
|
||||||
rspec-core (2.6.4)
|
rspec-core (~> 2.7.0)
|
||||||
rspec-expectations (2.6.0)
|
rspec-expectations (~> 2.7.0)
|
||||||
|
rspec-mocks (~> 2.7.0)
|
||||||
|
rspec-core (2.7.1)
|
||||||
|
rspec-expectations (2.7.0)
|
||||||
diff-lcs (~> 1.1.2)
|
diff-lcs (~> 1.1.2)
|
||||||
rspec-mocks (2.6.0)
|
rspec-mocks (2.7.0)
|
||||||
rspec-rails (2.6.1)
|
rspec-rails (2.7.0)
|
||||||
actionpack (~> 3.0)
|
actionpack (~> 3.0)
|
||||||
activesupport (~> 3.0)
|
activesupport (~> 3.0)
|
||||||
railties (~> 3.0)
|
railties (~> 3.0)
|
||||||
rspec (~> 2.6.0)
|
rspec (~> 2.7.0)
|
||||||
simplecov (0.4.2)
|
simplecov (0.5.4)
|
||||||
simplecov-html (~> 0.4.4)
|
multi_json (~> 1.0.3)
|
||||||
simplecov-html (0.4.5)
|
simplecov-html (~> 0.5.3)
|
||||||
sqlite3 (1.3.3)
|
simplecov-html (0.5.3)
|
||||||
|
sprockets (2.0.3)
|
||||||
|
hike (~> 1.2)
|
||||||
|
rack (~> 1.0)
|
||||||
|
tilt (~> 1.1, != 1.3.0)
|
||||||
|
sqlite3 (1.3.5)
|
||||||
sqlite3-ruby (1.3.3)
|
sqlite3-ruby (1.3.3)
|
||||||
sqlite3 (>= 1.3.3)
|
sqlite3 (>= 1.3.3)
|
||||||
thor (0.14.6)
|
thor (0.14.6)
|
||||||
treetop (1.4.9)
|
tilt (1.3.3)
|
||||||
|
treetop (1.4.10)
|
||||||
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.28)
|
tzinfo (0.3.31)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
require 'rspec/mocks'
|
||||||
|
require 'rspec/rails/mocks'
|
||||||
|
|
||||||
require 'generator_spec/test_case'
|
require 'generator_spec/test_case'
|
||||||
require 'generators/cocoon/install/install_generator'
|
require 'generators/cocoon/install/install_generator'
|
||||||
|
|
||||||
|
@ -9,18 +12,18 @@ describe Cocoon::Generators::InstallGenerator do
|
||||||
|
|
||||||
context "in rails 3.0" do
|
context "in rails 3.0" do
|
||||||
context "with no arguments" do
|
context "with no arguments" do
|
||||||
before(:all) do
|
before(:each) do
|
||||||
::Rails.stub(:version) { '3.0.8' }
|
::Rails.stub(:version) { '3.0.8' }
|
||||||
prepare_destination
|
prepare_destination
|
||||||
run_generator
|
run_generator
|
||||||
end
|
end
|
||||||
|
|
||||||
it "stubs the version correctly" do
|
it "stubs the version correctly" do
|
||||||
Rails.version[0..2].should == "3.0"
|
::Rails.version[0..2].should == "3.0"
|
||||||
end
|
end
|
||||||
|
|
||||||
it "stubs the version correctly" do
|
it "stubs the version correctly" do
|
||||||
test_version = (Rails.version[0..2].to_f >= 3.1)
|
test_version = (::Rails.version[0..2].to_f >= 3.1)
|
||||||
test_version.should be_false
|
test_version.should be_false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -32,7 +35,7 @@ describe Cocoon::Generators::InstallGenerator do
|
||||||
|
|
||||||
context "in rails 3.1" do
|
context "in rails 3.1" do
|
||||||
context "with no arguments" do
|
context "with no arguments" do
|
||||||
before(:all) do
|
before(:each) do
|
||||||
::Rails.stub(:version) { '3.1.0' }
|
::Rails.stub(:version) { '3.1.0' }
|
||||||
prepare_destination
|
prepare_destination
|
||||||
run_generator
|
run_generator
|
||||||
|
|
|
@ -9,7 +9,6 @@ end
|
||||||
|
|
||||||
|
|
||||||
require File.expand_path("../dummy/config/environment.rb", __FILE__)
|
require File.expand_path("../dummy/config/environment.rb", __FILE__)
|
||||||
require "rails/test_help"
|
|
||||||
require "rspec/rails"
|
require "rspec/rails"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue