Skip to content

Commit

Permalink
Merge pull request refile#599 from refile/fix-specs
Browse files Browse the repository at this point in the history
Fix specs
  • Loading branch information
sobrinho authored May 24, 2020
2 parents 385d796 + 34d5365 commit c4ac577
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 75 deletions.
1 change: 0 additions & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-r refile/spec_helper
-r pry
38 changes: 20 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
language: ruby

rvm:
- 2.2.10
- 2.3.8
- 2.4.5
- 2.5.3
- 2.6.0
- jruby-9.2.5.0

gemfile:
- gemfiles/Gemfile_Rails_5_0
- gemfiles/Gemfile_Rails_5_1
- gemfiles/Gemfile_Rails_5_2

cache: bundler

sudo: false
services:
- xvfb

before_install:
- gem install bundler -v '< 2'

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
jobs:
include:
# Rails 5.2 doesn't really work with Ruby 2.2 anymore, only if you use the
# 5-2-stable branch.
#
# See https://github.com/rails/rails/commit/892eab777c418135ce0646e91bc9ebb08a29ab9b
#
# - rvm: 2.2
# gemfile: gemfiles/Gemfile_Rails_5_2
- rvm: 2.3
gemfile: gemfiles/Gemfile_Rails_5_2
- rvm: 2.4
gemfile: gemfiles/Gemfile_Rails_5_2
- rvm: 2.5
gemfile: gemfiles/Gemfile_Rails_5_2
- rvm: 2.6
gemfile: gemfiles/Gemfile_Rails_5_2

25 changes: 0 additions & 25 deletions gemfiles/Gemfile_Rails_5_0

This file was deleted.

25 changes: 0 additions & 25 deletions gemfiles/Gemfile_Rails_5_1

This file was deleted.

8 changes: 3 additions & 5 deletions gemfiles/Gemfile_Rails_5_2
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ gem "rspec", "~> 3.0"
gem "rspec-rails", "~> 3.3"
gem "jquery-rails"
gem "capybara", "< 3.16"
gem "pry"
gem "pry-byebug", platforms: [:mri]
gem "aws-sdk"
gem "aws-sdk-s3"
gem "rack-test", "~> 0.6.2"
gem "rails", "~> 5.2.2"
gem "rails", "~> 5.2"
gem "sqlite3", "~> 1.3.6", platforms: [:ruby]
gem "activerecord-jdbcsqlite3-adapter", "~> 52.1", platforms: [:jruby]
gem "poltergeist"
Expand All @@ -22,4 +20,4 @@ gem "rubocop", "~> 0.49.0"
gem "puma"
gem "mini_magick"
gem "simple_form"
gem "i18n", "~> 1.2.0", platforms: [:jruby]
gem "i18n", "~> 1.2.0", "< 1.60"
1 change: 0 additions & 1 deletion spec/refile/test_app.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "pry"
require "yaml"
require "rails/all"

Expand Down
1 change: 1 addition & 0 deletions spec/refile/test_app/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= link application.js

0 comments on commit c4ac577

Please sign in to comment.