Skip to content

Commit

Permalink
Merge pull request #97 from Napolskih/master
Browse files Browse the repository at this point in the history
specs on rails 4.0
  • Loading branch information
Napolskih authored Jun 8, 2017
2 parents 4601c24 + 49430f3 commit 4cdb4ed
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ build:
- /home/data/drone/gems:/bundle
- /home/data/drone/key_cache:/ssh_keys
environment:
- RUBY_IMAGE_TAG=2.2-latest
- COMPOSE_FILE_EXT=drone
- POSTGRES_IMAGE_TAG=9.3-latest
- RUBY_IMAGE_TAG=2.2-latest
- POSTGRES_IMAGE_TAG=9.6-latest
- SPHINX_IMAGE_TAG=2.2-latest
commands:
- wrapdocker docker -v
Expand All @@ -26,7 +26,7 @@ build:
- dip rspec

release:
image: abakpress/gem-publication:latest
image: abakpress/gem-publication
pull: true
when:
event: push
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ appraise 'rails3.2' do
gem 'rails', '~> 3.2.22'
gem 'strong_parameters'
end

appraise 'rails4.0' do
gem 'rails', '~> 4.0.13'
end
4 changes: 2 additions & 2 deletions dip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '1'
environment:
DOCKER_RUBY_VERSION: 2.2
RUBY_IMAGE_TAG: 2.2-latest
POSTGRES_IMAGE_TAG: 9.3-latest
POSTGRES_IMAGE_TAG: 9.6-latest
SPHINX_IMAGE_TAG: 2.2-latest
COMPOSE_FILE_EXT: development
RAILS_ENV: test
Expand Down Expand Up @@ -47,4 +47,4 @@ provision:
- dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS}
- dip clean
- dip bundle install
- dip appraisal install
- dip appraisal install
4 changes: 3 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

require 'sphinx/integration/railtie'

Combustion.initialize! :active_record
Combustion.initialize! :active_record do
config.eager_load = true
end

require 'rspec/rails'

Expand Down

0 comments on commit 4cdb4ed

Please sign in to comment.