Skip to content

Update all libraries and tests #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 24, 2016
Merged

Update all libraries and tests #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
68e77f3
Update all gems and npm packages
justin808 Nov 12, 2016
a1bfe3d
Use default poltergeist driver
justin808 Nov 23, 2016
6f41a27
update phantomjs on travis
justin808 Nov 23, 2016
cf37e42
update travis
justin808 Nov 23, 2016
f105b36
trying to fix the deadlocks in sqlite for testing
justin808 Nov 23, 2016
89b1870
Remove sqlite and 12 factor
justin808 Nov 23, 2016
c325b06
Update travis settings for pgsql
justin808 Nov 23, 2016
3758392
remove sauce
justin808 Nov 23, 2016
b175c0a
Add poltergeist helper for restarting
justin808 Nov 23, 2016
80978f2
Update rubocop for longer methods
justin808 Nov 23, 2016
889154f
try resetting sessions for capybara
justin808 Nov 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ AllCops:
Metrics/LineLength:
Max: 120

Metrics/MethodLength:
Max: 25

Style/StringLiterals:
EnforcedStyle: double_quotes

Expand Down
25 changes: 17 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,31 @@ addons:
apt:
sources:
- ubuntu-toolchain-r-test
- travis-ci/sqlite3
packages:
- g++-4.9
- sqlite3
services:
- postgresql
env:
global:
- RAILS_ENV=test
- CXX=g++-4.9
before_install:
- mkdir $PWD/travis-phantomjs
- 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
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
install:
- bundle install
- nvm install 6.3
- nvm use 6.3
- nvm install 6.9.1
- nvm use 6.9.1
- npm install
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- rake db:setup
# No need to run xvfb if running headless testing
#before_script:
# - export DISPLAY=:99.0
# - sh -e /etc/init.d/xvfb start

script:
- bundle exec rake db:schema:load
- DRIVER=selenium_firefox bundle exec rake
# - DRIVER=selenium_firefox bundle exec rake
- bundle exec rake
12 changes: 4 additions & 8 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@ gem "rails"
gem "listen"

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

group :production do
# Pg is used for Heroku
gem "pg"
gem "rails_12factor" # Never include this for development or tests
end
gem "pg"

gem "puma"

Expand Down Expand Up @@ -104,7 +100,7 @@ group :test do
gem "generator_spec"
gem "launchy"
gem "poltergeist"
gem "rspec-rails", "3.5.0.beta3"
gem "rspec-rails", "~> 3"
gem "rspec-retry"
gem "selenium-webdriver", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
gem "selenium-webdriver", "<3.0.0", require: !["poltergeist", "poltergeist_errors_ok", "webkit"].include?(ENV["DRIVER"])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Judahmeek why less than 3.0.0

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was for sauce compatibility. They don't fully support Selenium 3 yet. Their docs certainly don't.

end
Loading