Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

Commit

Permalink
Bring back old bundler version to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
morgoth committed Sep 28, 2017
1 parent 176de35 commit 38166cf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
language: ruby
cache: bundler
sudo: false

rvm:
- 2.1
- 2.2
- 2.3
- 2.4

# FIXME: fails with modern bundler
before_install:
- rvm @global do gem uninstall bundler -a -x
- rvm @global do gem install bundler -v 1.12.5

script: "bundle exec rake clean spec cucumber"

addons:
Expand Down
15 changes: 3 additions & 12 deletions features/step_definitions/rails_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@

steps %{
And I turn off class caching
And I fix the application.rb for 3.0.12
And I write to "Gemfile" with:
"""
source "http://rubygems.org"
gem "rails", "#{framework_version}"
gem "sqlite3", "1.3.8", :platform => [:ruby, :rbx]
gem "sqlite3", :platform => [:ruby, :rbx]
gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
gem "jruby-openssl", :platform => :jruby
gem "capybara"
gem "gherkin"
gem "aws-sdk"
gem "aws-sdk", "~> 2.0.0"
gem "racc", :platform => :rbx
gem "rubysl", :platform => :rbx
"""
Expand All @@ -30,14 +29,6 @@
FileUtils.chdir("../../..")
end

Given "I fix the application.rb for 3.0.12" do
cd(".") do
File.open("config/application.rb", "a") do |f|
f << "ActionController::Base.config.relative_url_root = ''"
end
end
end

Given "I allow the attachment to be submitted" do
cd(".") do
transform_file("app/controllers/users_controller.rb") do |content|
Expand Down Expand Up @@ -174,7 +165,7 @@ def attach_attachment(name, definition = nil)

When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
append_to_gemfile "gem '#{name}', :path => '#{PROJECT_ROOT}'"
steps %{And I run `bundle install --local`}
steps %{And I successfully run `bundle install --local`}
end

When /^I configure the application to use "([^\"]+)"$/ do |gem_name|
Expand Down

0 comments on commit 38166cf

Please sign in to comment.