Skip to content

Commit e72e02c

Browse files
committedSep 19, 2018
[MODEL] Port all integration tests to rspec (elastic#837)
1 parent d930a93 commit e72e02c

Some content is hidden

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

70 files changed

+2338
-1920
lines changed
 

‎elasticsearch-model/Rakefile

+4-7
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,17 @@ namespace :test do
3434

3535
desc "Run unit tests against ActiveModel 3, 4 and 5"
3636
task :unit do
37+
end
38+
39+
desc "Run integration tests against latest stable ActiveModel (5)"
40+
task :integration do
3741
['3.0.gemfile', '4.0.gemfile', '5.0.gemfile'].each do |gemfile|
3842
['bundle exec rake test:run_unit', 'bundle exec rspec'].each do |cmd|
3943
sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/'+gemfile, __FILE__)}' #{cmd}"
4044
end
4145
end
4246
end
4347

44-
desc "Run integration tests against latest stable ActiveModel (5)"
45-
task :integration do
46-
#sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
47-
#sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
48-
sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
49-
end
50-
5148
desc "Run unit and integration tests"
5249
task :all do
5350
Rake::Task['test:unit'].invoke

‎elasticsearch-model/gemfiles/4.0.gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gemspec path: '../'
1010
gem 'activemodel', '~> 4'
1111
gem 'activerecord', '~> 4'
1212
gem 'sqlite3' unless defined?(JRUBY_VERSION)
13+
gem 'mongoid', '~> 5'
1314

1415
group :development, :testing do
1516
gem 'rspec'

0 commit comments

Comments
 (0)