codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

hold back some gems, do fix rspec issue

Browse source
This commit is contained in:
Sam 2014-09-25 11:04:22 +10:00
parent 35f7168499
commit c43f6455f2
3 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile
View file

@ -167,7 +167,8 @@ group :assets do
if rails_master? if rails_master?
gem 'sass-rails', git: 'https://github.com/rails/sass-rails.git' gem 'sass-rails', git: 'https://github.com/rails/sass-rails.git'
else else
gem 'sass-rails', '~> 4.0.2' # later is breaking our asset compliation extensions
gem 'sass-rails', '4.0.2'
end end
gem 'uglifier' gem 'uglifier'
@ -180,10 +181,13 @@ group :test do
end end
group :test, :development do group :test, :development do
# while upgrading to 3
gem 'rspec', '2.99.0'
gem 'mock_redis' gem 'mock_redis'
gem 'listen', '0.7.3', require: false gem 'listen', '0.7.3', require: false
gem 'certified', require: false gem 'certified', require: false
gem 'fabrication', require: false # later appears to break Fabricate(:topic, category: category)
gem 'fabrication', '2.9.8', require: false
gem 'qunit-rails' gem 'qunit-rails'
gem 'mocha', require: false gem 'mocha', require: false
gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false

46
Gemfile.lock
View file

@ -84,7 +84,7 @@ GEM
excon (0.39.6) excon (0.39.6)
execjs (2.2.1) execjs (2.2.1)
exifr (1.1.3) exifr (1.1.3)
fabrication (2.11.3) fabrication (2.9.8)
fakeweb (1.3.0) fakeweb (1.3.0)
faraday (0.9.0) faraday (0.9.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
@ -293,29 +293,28 @@ GEM
netrc (~> 0.7) netrc (~> 0.7)
rinku (1.7.3) rinku (1.7.3)
rmmseg-cpp (0.2.9) rmmseg-cpp (0.2.9)
rspec (3.1.0) rspec (2.99.0)
rspec-core (~> 3.1.0) rspec-core (~> 2.99.0)
rspec-expectations (~> 3.1.0) rspec-expectations (~> 2.99.0)
rspec-mocks (~> 3.1.0) rspec-mocks (~> 2.99.0)
rspec-core (3.1.4) rspec-collection_matchers (1.0.0)
rspec-support (~> 3.1.0) rspec-expectations (>= 2.99.0.beta1)
rspec-expectations (3.1.1) rspec-core (2.99.2)
diff-lcs (>= 1.2.0, < 2.0) rspec-expectations (2.99.2)
rspec-support (~> 3.1.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-given (3.5.4) rspec-given (3.5.4)
given_core (= 3.5.4) given_core (= 3.5.4)
rspec (>= 2.12) rspec (>= 2.12)
rspec-mocks (3.1.1) rspec-mocks (2.99.2)
rspec-support (~> 3.1.0) rspec-rails (2.99.0)
rspec-rails (3.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 3.1.0) rspec-collection_matchers
rspec-expectations (~> 3.1.0) rspec-core (~> 2.99.0)
rspec-mocks (~> 3.1.0) rspec-expectations (~> 2.99.0)
rspec-support (~> 3.1.0) rspec-mocks (~> 2.99.0)
rspec-support (3.1.0)
rtlit (0.0.5) rtlit (0.0.5)
ruby-openid (2.5.0) ruby-openid (2.5.0)
ruby-readability (0.7.0) ruby-readability (0.7.0)
@ -326,11 +325,11 @@ GEM
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
nokogumbo (= 1.1.12) nokogumbo (= 1.1.12)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.3) sass-rails (4.0.2)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0) sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0.0)
seed-fu (2.3.3) seed-fu (2.3.3)
activerecord (>= 3.1, < 4.2) activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2) activesupport (>= 3.1, < 4.2)
@ -367,7 +366,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.4) sprockets-rails (2.0.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -416,7 +415,7 @@ DEPENDENCIES
ember-rails ember-rails
ember-source (= 1.6.0.beta.2) ember-source (= 1.6.0.beta.2)
eventmachine eventmachine
fabrication fabrication (= 2.9.8)
fakeweb (~> 1.3.0) fakeweb (~> 1.3.0)
fast_blank fast_blank
fast_xor fast_xor
@ -473,13 +472,14 @@ DEPENDENCIES
rest-client rest-client
rinku rinku
rmmseg-cpp rmmseg-cpp
rspec (= 2.99.0)
rspec-given rspec-given
rspec-rails rspec-rails
rtlit rtlit
ruby-readability ruby-readability
sanitize sanitize
sass sass
sass-rails (~> 4.0.2) sass-rails (= 4.0.2)
seed-fu (~> 2.3.3) seed-fu (~> 2.3.3)
shoulda shoulda
sidekiq sidekiq

1
spec/spec_helper.rb
View file

@ -45,6 +45,7 @@ Spork.prefork do
config.include MessageBus config.include MessageBus
config.mock_framework = :mocha config.mock_framework = :mocha
config.order = 'random' config.order = 'random'
config.infer_spec_type_from_file_location!
# If you're not using ActiveRecord, or you'd prefer not to run each of your # If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false # examples within a transaction, remove the following line or assign false