mirror of
https://github.com/diaspora/diaspora.git
synced 2026-04-29 03:01:03 -04:00
fixed the addressable issue; we needed to specify the actuall file the gem gets required as ::sigh::
This commit is contained in:
8
Gemfile
8
Gemfile
@@ -3,17 +3,15 @@ source 'http://rubygems.org'
|
||||
gem 'rails', '3.0.0.beta4'
|
||||
gem 'mongrel'
|
||||
gem 'thin'
|
||||
gem 'em-http-request'
|
||||
gem 'addressable'
|
||||
gem 'em-http-request', :require => "em-http"
|
||||
gem 'addressable', :require => "addressable/uri"
|
||||
gem "mongoid", :git => "git://github.com/durran/mongoid.git"
|
||||
gem "bson_ext", "1.0.1"
|
||||
gem "haml"
|
||||
gem "devise", :git => "git://github.com/plataformatec/devise.git"
|
||||
gem 'roxml', :git => "git://github.com/Empact/roxml.git"
|
||||
|
||||
|
||||
gem 'dm-core' #:(
|
||||
|
||||
|
||||
group :test do
|
||||
gem 'rspec', '>= 2.0.0.beta.12'
|
||||
gem 'rspec-rails', ">= 2.0.0.beta.8"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require 'addressable/uri'
|
||||
require 'eventmachine'
|
||||
require 'em-http'
|
||||
# require 'addressable/uri'
|
||||
# require 'eventmachine'
|
||||
# require 'em-http'
|
||||
|
||||
class MessageHandler
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ Rspec.configure do |config|
|
||||
#
|
||||
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
|
||||
#this is a dumb hax TODO
|
||||
config.mock_with :mocha
|
||||
#config.mock_with :mocha
|
||||
# config.mock_with :flexmock
|
||||
# config.mock_with :rr
|
||||
config.mock_with :rspec
|
||||
@@ -41,5 +41,5 @@ Rspec.configure do |config|
|
||||
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
||||
# examples within a transaction, comment the following line or assign false
|
||||
# instead of true.
|
||||
config.use_transactional_fixtures = false
|
||||
config.use_transactional_fixtures = true
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user