team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #366 from jasnow/master

Browse Source 
LGTM 👍  - thanks @jasnow
This commit is contained in:
Ken Johnson
2019-09-09 14:37:03 -04:00
committed by GitHub
parent 01561b6d7e dcc16729db
commit 0dcadc065f
4 changed files with 75 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ruby-version
+1 -1
View File
@@ -1 +1 @@
2.6.2
2.6.4
.travis.yml
+1 -2
View File
@@ -1,6 +1,6 @@
language: ruby
rvm:
- "2.6.2"
- "2.6.4"
before_install:
- "phantomjs --version"
@@ -13,5 +13,4 @@ before_install:
before_script: bundle exec rails db:test:prepare
cache: bundler
sudo: false
env: RAILSGOAT_MAINTAINER=true
Gemfile
+4 -4
View File
@@ -4,7 +4,7 @@ source "https://rubygems.org"
#don't upgrade
gem "rails", "5.1.7"
ruby "2.6.2"
ruby "2.6.4"
gem "aruba"
gem "bcrypt"
@@ -21,9 +21,9 @@ gem "rails-perftest"
gem "rake"
gem "responders" #For Rails 4.2 # LOCKED DOWN
gem "ruby-prof"
gem "sass-rails"
gem "sassc-rails"
gem "simplecov", require: false, group: :test
gem "sqlite3", "1.3.13" # 2/7/2019: LOCKED DOWN
gem "sqlite3"
gem "therubyracer"
gem "turbolinks"
gem "uglifier"
@@ -52,7 +52,7 @@ group :development, :test, :mysql do
gem "database_cleaner"
gem "launchy"
gem "poltergeist"
gem "rspec-rails"
gem "rspec-rails", '4.0.0.beta2' # 4/26/2019: LOCKED DOWN
gem "test-unit"
end
Gemfile.lock
+69 -73
View File
@@ -38,19 +38,19 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (8.0.0)
aruba (0.14.9)
childprocess (>= 0.6.3, < 1.1.0)
aruba (0.14.11)
childprocess (>= 0.6.3, < 3.0.0)
contracts (~> 0.9)
cucumber (>= 1.3.19)
ffi (~> 1.9)
rspec-expectations (>= 2.99)
thor (~> 0.19)
ast (2.4.0)
backports (3.13.0)
bcrypt (3.1.12)
backports (3.15.0)
bcrypt (3.1.13)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
@@ -61,15 +61,15 @@ GEM
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
capybara (3.16.1)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (1.0.1)
childprocess (2.0.0)
rake (< 13.0)
cliver (0.3.2)
coderay (1.1.2)
@@ -102,21 +102,21 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.3.1)
docile (1.3.2)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubi (1.8.0)
eventmachine (1.2.7)
execjs (2.7.0)
ffi (1.10.0)
ffi (1.11.1)
foreman (0.85.0)
thor (~> 0.19.1)
formatador (0.2.5)
gherkin (5.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
guard (2.15.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
@@ -141,12 +141,12 @@ GEM
http_parser.rb (0.6.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
jquery-fileupload-rails (1.0.0)
actionpack (>= 3.1)
railties (>= 3.1)
sassc
jquery-rails (4.3.3)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -166,21 +166,21 @@ GEM
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.2)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
multi_test (0.1.2)
mysql2 (0.5.2)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.10.2)
nio4r (2.5.1)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
parallel (1.17.0)
parser (2.6.2.1)
parser (2.6.4.0)
ast (~> 2.4.0)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
@@ -188,15 +188,15 @@ GEM
websocket-driver (>= 0.2.0)
powder (0.4.0)
thor (>= 0.11.5)
power_assert (1.1.4)
power_assert (1.1.5)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
psych (3.1.0)
public_suffix (3.0.3)
puma (3.12.1)
public_suffix (4.0.1)
puma (4.1.1)
nio4r (~> 2.0)
rack (2.0.7)
rack-livereload (0.3.17)
rack
@@ -217,7 +217,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-perftest (0.0.7)
railties (5.1.7)
@@ -228,65 +228,61 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
raindrops (0.19.0)
rake (12.3.2)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
ref (2.0.0)
regexp_parser (1.4.0)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
regexp_parser (1.6.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.67.2)
rspec-rails (4.0.0.beta2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.8)
rspec-expectations (~> 3.8)
rspec-mocks (~> 3.8)
rspec-support (~> 3.8)
rspec-support (3.8.2)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
psych (>= 3.1.0)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-github (0.12.0)
rubocop (~> 0.59)
ruby-prof (0.17.0)
ruby-progressbar (1.10.0)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-github (0.13.0)
rubocop (~> 0.70)
rubocop-performance (~> 1.3.0)
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
ruby-prof (1.0.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.1)
sassc (2.2.0)
ffi (~> 1.9)
rake
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
shellany (0.0.1)
simplecov (0.16.1)
simplecov (0.17.0)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
@@ -298,8 +294,8 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
test-unit (3.3.1)
sqlite3 (1.4.1)
test-unit (3.3.3)
power_assert
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
@@ -316,13 +312,13 @@ GEM
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.5.0)
unicorn (5.5.0)
unicode-display_width (1.6.0)
unicorn (5.5.1)
kgio (~> 2.6)
raindrops (~> 0.7)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
@@ -359,12 +355,12 @@ DEPENDENCIES
rake
rb-fsevent
responders
rspec-rails
rspec-rails (= 4.0.0.beta2)
rubocop-github
ruby-prof
sass-rails
sassc-rails
simplecov
sqlite3 (= 1.3.13)
sqlite3
test-unit
therubyracer
travis-lint
@@ -373,7 +369,7 @@ DEPENDENCIES
unicorn
RUBY VERSION
ruby 2.6.2p47
ruby 2.6.4p104
BUNDLED WITH
1.17.2
1.17.3