Skip to content

Commit 0fa179f

Browse files
committedJul 2, 2013
Add test suite converted to rspec
Update gemfiles for travis builds. Minor spec fixes for 1.8.7 - not passing on 1.8.7 yet Add common gemfile
1 parent 2cce239 commit 0fa179f

File tree

78 files changed

+13698
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+13698
-65
lines changed
 

‎Gemfile

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
source 'https://rubygems.org'
1+
eval File.read(File.expand_path('../gemfiles/Gemfile.common', __FILE__)), nil, 'Gemfile.common'
22
gemspec
33

4-
gem 'rake'
5-
gem 'mongo', '~> 1.8'
6-
gem 'bson_ext', '~> 1.8'
7-
gem 'multi_json', '~> 1.2.0'
8-
9-
group :test do
10-
gem 'rails', '~> 3.2.0'
11-
gem 'jnunemaker-matchy', '~> 0.4', :require => 'matchy'
12-
gem 'shoulda', '~> 2.11'
13-
gem 'timecop', '~> 0.3'
14-
gem 'mocha', '~> 0.10.0'
15-
gem 'rack-test', '~> 0.6'
16-
end
4+
gem 'rails', '~> 3.2.0', :group => :test

‎Rakefile

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
require 'rubygems'
22
require 'bundler/setup'
33
require 'rake'
4-
require 'rake/testtask'
54
require File.expand_path('../lib/mongo_mapper/version', __FILE__)
65

7-
Rake::TestTask.new(:test) do |test|
8-
test.libs << 'lib' << 'test'
9-
test.pattern = 'test/**/test_*.rb'
6+
begin
7+
require 'rspec/core/rake_task'
8+
RSpec::Core::RakeTask.new(:spec) do |spec|
9+
spec.pattern = 'spec/**/*_spec.rb'
10+
spec.rspec_opts = ['--color']
11+
end
12+
task :default => :spec
13+
rescue LoadError
14+
nil
1015
end
1116

12-
task :default => :test
13-
1417
desc 'Builds the gem'
1518
task :build do
1619
sh "gem build mongo_mapper.gemspec"

0 commit comments

Comments
 (0)
Please sign in to comment.