Merge branch 'next-minor' into develop

.github/workflows/ci.yml

@@ -12,7 +12,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         ruby:
           - 2.6

Gemfile

@@ -294,9 +294,6 @@ group :test do
   gem "webmock",            "3.8.3", require: false
 
   gem "diaspora_federation-test", "0.2.6"
-
-  # Coverage
-  gem "coveralls", "0.8.23", require: false
 end
 
 group :development, :test do
@@ -307,7 +304,7 @@ group :development, :test do
   gem "cucumber-rails", "2.0.0", require: false
 
   # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "3.5.1"
+  gem "jasmine",                   "3.6.0"
   gem "jasmine-jquery-rails",      "2.0.3"
   gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
   gem "sinon-rails",               "1.15.0"

Gemfile.lock

@@ -139,12 +139,6 @@ GEM
     concurrent-ruby (1.1.6)
     configurate (0.5.0)
     connection_pool (2.2.2)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -347,12 +341,12 @@ GEM
     idn-ruby (0.1.0)
     ipaddress (0.8.3)
     jaro_winkler (1.5.4)
-    jasmine (3.5.1)
+    jasmine (3.6.0)
-      jasmine-core (~> 3.5.0)
+      jasmine-core (~> 3.6.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (3.5.0)
+    jasmine-core (3.6.0)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
@@ -710,12 +704,9 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    sync (0.5.0)
     sysexits (1.2.0)
     systemu (2.6.5)
     temple (0.8.2)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
@@ -723,8 +714,6 @@ GEM
     tilt (2.0.10)
     timecop (0.9.1)
     timers (4.3.0)
-    tins (1.24.1)
-      sync
     to_regexp (0.2.1)
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
@@ -807,7 +796,6 @@ DEPENDENCIES
   carrierwave (= 1.3.1)
   compass-rails (= 3.1.0)
   configurate (= 0.5.0)
-  coveralls (= 0.8.23)
   cucumber-api-steps (= 0.14)
   cucumber-rails (= 2.0.0)
   database_cleaner (= 1.8.3)
@@ -835,7 +823,7 @@ DEPENDENCIES
   handlebars_assets (= 0.23.8)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)
-  jasmine (= 3.5.1)
+  jasmine (= 3.6.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.3.5)
   js-routes (= 1.4.9)

README.md

@@ -1,11 +1,6 @@
 # diaspora\*
 ### A privacy-aware, distributed, open source social network
 
-[![Coverage Status next-minor](https://coveralls.io/repos/github/diaspora/diaspora/badge.svg?branch=next-minor)](https://coveralls.io/github/diaspora/diaspora?branch=next-minor)|
-**develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.svg?branch=develop)](http://travis-ci.org/diaspora/diaspora)
-[![Coverage Status develop](https://coveralls.io/repos/github/diaspora/diaspora/badge.svg?branch=develop)](https://coveralls.io/github/diaspora/diaspora?branch=develop) |
-[![Code Climate](https://codeclimate.com/github/diaspora/diaspora/badges/gpa.svg)](https://codeclimate.com/github/diaspora/diaspora)
-
 [Project site](https://diasporafoundation.org) |
 [Wiki](https://wiki.diasporafoundation.org) |
 [Bugtracker](https://github.com/diaspora/diaspora/issues) |

features/support/env.rb

@@ -7,9 +7,6 @@ ENV["RAILS_ENV"] ||= "test"
 # Have all rests run with english browser locale
 ENV["LANG"] = "C"
 
-require 'coveralls'
-Coveralls.wear!('rails')
-
 require "cucumber/rails"
 
 require "capybara/rails"

lib/tasks/cucumber.rake

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
+# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -20,7 +20,7 @@ begin
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
-      t.cucumber_opts = %w[--retry 3]
+      t.cucumber_opts = %w[--retry 3 --no-strict-flaky --fail-fast]
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|

spec/spec_helper.rb

@@ -6,9 +6,6 @@
 
 ENV["RAILS_ENV"] ||= "test"
 
-require 'coveralls'
-Coveralls.wear!('rails')
-
 require File.join(File.dirname(__FILE__), "..", "config", "environment")
 require Rails.root.join("spec", "helper_methods")
 require "rspec/rails"