Skip to content
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.

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

Feature/testing #3360

Merged
merged 21 commits into from
Apr 18, 2018
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
remove record
edbrett committed Apr 12, 2018

Verified

This commit was signed with the committer’s verified signature.
zuisong zuisong
commit c238355c5ec0e38f0b4fcc393104867750ad25ac
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -15,5 +15,8 @@ cache:
install:
- bundle install && npm install

before_script:
- npm run prod-server -- --silent

script:
- npm run ci
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base

protect_from_forgery with: :exception

before_action :check_browser
# before_action :check_browser

def not_found
raise ActionController::RoutingError.new('Not Found')
Binary file added cypress/videos/sfqq8.mp4
Binary file not shown.
Binary file removed cypress/videos/sgk7m.mp4
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@
"webpack": "./bin/webpack",
"start": "./bin/server",
"prod-server": "bundle exec foreman start -f Procfile",
"start-prod-server": "prod-server -- --silent &",
"ci": "start-server-and-test start-prod-server http://localhost:5000 test:record",
"start-prod-server": "npm run prod-server -- --silent &",
"ci": "npm run test:record",
"server": "./bin/webpack-dev-server",
"lint": "eslint --ext js --ext jsx .",
"precommit": "lint-staged",