From ee320b281cbb7ce76eeeea33eef9a3b4b61937ec Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Tue, 5 Feb 2019 16:01:15 +0100 Subject: [PATCH 1/3] Replace coveralls with Codacy --- .coveralls.yml | 1 - Gemfile | 4 ++-- Gemfile.lock | 15 ++++----------- test/test_helper.rb | 5 +++-- 4 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 6e64999..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -service_name: travis-ci \ No newline at end of file diff --git a/Gemfile b/Gemfile index 3961c14..b1e17c5 100644 --- a/Gemfile +++ b/Gemfile @@ -34,8 +34,8 @@ gem 'sdoc', '~> 1.0.0', group: :doc gem 'web-console', '~> 3.7.0', group: :development -# Use Coveralls for coverage documentation -gem 'coveralls', '~> 0.8.22', require: false +# Use Codacy for coverage +gem 'codacy-coverage', :require => false gem 'bootstrap-sass', '~> 3.4.0' gem 'autoprefixer-rails', '~> 9.4.6' diff --git a/Gemfile.lock b/Gemfile.lock index d33a1a8..f1e7f6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,6 +58,8 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.3) + codacy-coverage (2.1.0) + simplecov codemirror-rails (5.16.0) railties (>= 3.0, < 6.0) coffee-rails (4.2.2) @@ -68,12 +70,6 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.4) - coveralls (0.8.22) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) crass (1.0.4) devise (4.5.0) bcrypt (~> 3.0) @@ -102,7 +98,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) + json (2.1.0) jwt (2.1.0) loofah (2.2.3) crass (~> 1.0.2) @@ -213,12 +209,9 @@ GEM sqlite3 (1.3.13) sqlite3 (1.3.13-x64-mingw32) sqlite3 (1.3.13-x86-mingw32) - term-ansicolor (1.7.1) - tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) tilt (2.0.9) - tins (1.20.2) turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -253,9 +246,9 @@ DEPENDENCIES bh (~> 1.3.6) bootsnap bootstrap-sass (~> 3.4.0) + codacy-coverage codemirror-rails (~> 5.16.0) coffee-rails (~> 4.2.2) - coveralls (~> 0.8.22) devise (~> 4.5.0) devise-bootstrap-views (~> 0.0.11) jbuilder (~> 2.8.0) diff --git a/test/test_helper.rb b/test/test_helper.rb index e8d4041..3411595 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,6 @@ -require 'coveralls' -Coveralls.wear!('rails') +require 'codacy-coverage' + +Codacy::Reporter.start ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) From 9e48486b5d771c4c178c57a70924f529de551a1b Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Tue, 5 Feb 2019 16:01:42 +0100 Subject: [PATCH 2/3] Use db:schema:load for CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f490c2..e1cd9ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ rvm: - 2.3 script: - export RAILS_ENV=test - - bundle exec rake db:create db:migrate + - bundle exec rake db:schema:load - bundle exec rake test \ No newline at end of file From 446ada6f367506ada8f30a3085f8a0a402bf0c10 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Tue, 5 Feb 2019 16:06:27 +0100 Subject: [PATCH 3/3] Update badges in README --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a4ecbad..3e3c51f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ Projekt Euler ============= -[![Build Status](https://travis-ci.org/PFischbeck/projekteuler.svg?branch=master)](https://travis-ci.org/PFischbeck/projekteuler) -[![Coverage Status](https://img.shields.io/coveralls/PFischbeck/projekteuler.svg)](https://coveralls.io/r/PFischbeck/projekteuler?branch=master) -[![Code Climate](https://codeclimate.com/github/PFischbeck/projekteuler/badges/gpa.svg)](https://codeclimate.com/github/PFischbeck/projekteuler) -[![security](https://hakiri.io/github/PFischbeck/projekteuler/master.svg)](https://hakiri.io/github/PFischbeck/projekteuler/master) +[![Build Status](https://travis-ci.com/projekteuler/projekteuler.svg?branch=master)](https://travis-ci.org/PFischbeck/projekteuler) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/68921bff5347435f8fff10c1d6872568)](https://www.codacy.com/app/projekteuler/projekteuler) This is a rails app for the german translation of [projecteuler.net](https://projecteuler.net).