summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-05 13:52:23 +0200
committerAzul <azul@leap.se>2012-10-05 13:57:24 +0200
commitf7e832b111b38c1b2bdef45ab74001590b17c0dc (patch)
tree183ca4d265b3adf20a7190517a012969b2fb78a2
parent6cf3dacd4a4d0f30a41c6a75658443ce6192e750 (diff)
adding mocha for tests
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock6
-rw-r--r--test/test_helper.rb2
3 files changed, 12 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 015c5ad..0bdea00 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,11 @@ gem 'leap_web_help', :path => 'help'
gem 'couchrest_session_store'
+
+group :development, :test do
+ gem 'mocha'
+end
+
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e9b4de8..4f2ee3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,7 +112,10 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ metaclass (0.0.1)
mime-types (1.19)
+ mocha (0.12.4)
+ metaclass (~> 0.0.1)
multi_json (1.3.6)
polyglot (0.3.3)
rack (1.4.1)
@@ -148,7 +151,7 @@ GEM
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
- ruby-srp (0.0.2)
+ ruby-srp (0.1.0)
sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
@@ -186,6 +189,7 @@ DEPENDENCIES
leap_web_core!
leap_web_help!
leap_web_users!
+ mocha
rails (= 3.2.8)
ruby-debug
sass-rails (~> 3.2.5)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8298517..f7d48ec 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,6 +2,8 @@ ENV["RAILS_ENV"] = "test"
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
+require 'mocha'
+
class ActiveSupport::TestCase
# Add more helper methods to be used by all tests here...
end