Skip to content

Commit 51188ce

Browse files
authored
Update all libraries and tests (shakacode#334)
* Update all gems and npm packages * Update mini-racer for Mac OS Sierra (shakacode#338) * Updated linter to eslint-config-shakacode 13.1.1 * Convert to latest react-bootstrap syntax * fix scss lint * Fixed a couple real bugs in the test and app code * Tests passing locally with poltergeist. * Use default poltergeist driver * update phantomjs on travis * update travis * Remove sqlite and 12 factor gems https://github.com/heroku/rails_12factor#rails-5 says 12 factor not needed for heroku * Update travis settings for pgsql * Add poltergeist helper for restarting * Update rubocop for longer methods * try resetting sessions for capybara
1 parent c42e807 commit 51188ce

36 files changed

+456
-5804
lines changed

Diff for: .rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ AllCops:
2121
Metrics/LineLength:
2222
Max: 120
2323

24+
Metrics/MethodLength:
25+
Max: 25
26+
2427
Style/StringLiterals:
2528
EnforcedStyle: double_quotes
2629

Diff for: .travis.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,31 @@ addons:
77
apt:
88
sources:
99
- ubuntu-toolchain-r-test
10-
- travis-ci/sqlite3
1110
packages:
1211
- g++-4.9
13-
- sqlite3
12+
services:
13+
- postgresql
1414
env:
1515
global:
1616
- RAILS_ENV=test
1717
- CXX=g++-4.9
18+
before_install:
19+
- mkdir $PWD/travis-phantomjs
20+
- curl -sSL https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2 -o $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
21+
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
22+
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
1823
install:
1924
- bundle install
20-
- nvm install 6.3
21-
- nvm use 6.3
25+
- nvm install 6.9.1
26+
- nvm use 6.9.1
2227
- npm install
23-
before_script:
24-
- export DISPLAY=:99.0
25-
- sh -e /etc/init.d/xvfb start
28+
- rake db:setup
29+
# No need to run xvfb if running headless testing
30+
#before_script:
31+
# - export DISPLAY=:99.0
32+
# - sh -e /etc/init.d/xvfb start
33+
2634
script:
2735
- bundle exec rake db:schema:load
28-
- DRIVER=selenium_firefox bundle exec rake
36+
# - DRIVER=selenium_firefox bundle exec rake
37+
- bundle exec rake

Diff for: Gemfile

+4-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ gem "rails"
77
gem "listen"
88

99
# Note: We're using sqllite3 for development and testing
10-
gem "sqlite3", group: [:development, :test]
10+
# gem "sqlite3", group: [:development, :test]
1111

12-
group :production do
13-
# Pg is used for Heroku
14-
gem "pg"
15-
gem "rails_12factor" # Never include this for development or tests
16-
end
12+
gem "pg"
1713

1814
gem "puma"
1915

@@ -104,7 +100,7 @@ group :test do
104100
gem "generator_spec"
105101
gem "launchy"
106102
gem "poltergeist"
107-
gem "rspec-rails", "3.5.0.beta3"
103+
gem "rspec-rails", "~> 3"
108104
gem "rspec-retry"
109-
gem "selenium-webdriver", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
105+
gem "selenium-webdriver", "<3.0.0", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
110106
end

0 commit comments

Comments
 (0)