Permalink
Browse files

removed active_record from tests

  • Loading branch information...
rkononov committed Nov 15, 2012
1 parent a69a47d commit 95626efa014e43d3c5387dad656ffa24289f21fa
Showing with 5 additions and 8 deletions.
  1. +1 −2 test/Gemfile
  2. +1 −3 test/Gemfile.lock
  3. +2 −2 test/models/db_model.rb
  4. +1 −1 test/test_merging.rb
View
@@ -15,8 +15,7 @@ group :test do
gem 'uber_config'
gem 'simple_record'
- gem 'activerecord','>3'
- gem 'activesupport','>3'
+ gem 'activesupport'
gem 'simple_record'
gem 'dropbox', '1.2.3'
gem 'pusher'
View
@@ -2,7 +2,6 @@ GEM
remote: http://rubygems.org/
specs:
Ascii85 (1.0.2)
- activerecord (3.2.8)
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
@@ -143,8 +142,7 @@ PLATFORMS
ruby
DEPENDENCIES
- activerecord (> 3)
- activesupport (> 3)
+ activesupport
aws-s3
carrierwave
concur
View
@@ -1,6 +1,6 @@
-require 'active_record'
+#require 'active_record'
-class DbModel < ActiveRecord::Base
+class DbModel #< ActiveRecord::Base
end
View
@@ -1,5 +1,5 @@
require_relative 'test_base'
-require 'active_record'
+#require 'active_record'
require_relative 'workers/cool_worker'
require_relative 'models/cool_model'
require_relative 'models/db_model'

0 comments on commit 95626ef

Please sign in to comment.