Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
188 changes: 0 additions & 188 deletions .circleci/config.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .codeclimate.yml

This file was deleted.

3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ gem 'rgl'

group :development, :test do
gem 'bullet', '>= 6.0.2'
gem 'brakeman', require: false
gem 'pry-byebug'
gem 'rspec-rails', '>= 3.8.3'
gem 'rubocop', require: false
Expand All @@ -29,7 +30,6 @@ end

group :development do
gem 'better_errors', '>= 2.5.1'
gem 'brakeman', require: false
gem 'bummr', require: false
gem 'guard-rspec', require: false
gem 'overcommit', require: false
Expand All @@ -39,6 +39,7 @@ end

group :test do
gem 'axe-matchers', '~> 1.3.4'
gem 'bundler-audit', require: false
gem 'database_cleaner'
gem 'factory_bot_rails', '>= 5.2.0'
gem 'fakefs', require: 'fakefs/safe'
Expand Down
6 changes: 5 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,17 @@ GEM
rack (>= 0.9.0)
bloomfilter-rb (2.1.1)
redis
brakeman (4.10.0)
brakeman (6.0.1)
builder (3.2.4)
bullet (6.1.4)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bummr (0.5.0)
rainbow
thor
bundler-audit (0.9.1)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
byebug (11.1.3)
childprocess (4.0.0)
choice (0.2.0)
Expand Down Expand Up @@ -384,6 +387,7 @@ DEPENDENCIES
brakeman
bullet (>= 6.0.2)
bummr
bundler-audit
database_cleaner
factory_bot_rails (>= 5.2.0)
fakefs
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ check: lint test
lint:
@echo "--- rubocop ---"
bundle exec rubocop
@echo "--- brakeman ---"
bundle exec brakeman
@echo "--- bundler-audit ---"
bundle exec bundler-audit check --update
@echo "--- lint Gemfile.lock ---"
make lint_gemfile_lock

lint_gemfile_lock: Gemfile Gemfile.lock ## Lints the Gemfile and its lockfile
@bundle check
@git diff-index --quiet HEAD Gemfile.lock || (echo "Error: There are uncommitted changes after running 'bundle install'"; exit 1)

lintfix:
@echo "--- rubocop fix ---"
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
end

require 'webmock/rspec'
WebMock.disable_net_connect!(allow: [/localhost/, /127\.0\.0\.1/, /codeclimate.com/])
WebMock.disable_net_connect!(allow: [/localhost/, /127\.0\.0\.1/])

require 'zonebie/rspec'