From e1aff7e3ab395ee876d51eed3493a54f2af7454e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 2 Nov 2020 16:20:35 +0100 Subject: [PATCH 1/3] drop coveralls --- Gemfile | 3 --- Gemfile.lock | 12 ------------ README.md | 5 ----- features/support/env.rb | 3 --- spec/spec_helper.rb | 3 --- 5 files changed, 26 deletions(-) diff --git a/Gemfile b/Gemfile index ceef48d18..883c0996b 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 843faedc3..9b1e35a3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,12 +135,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) @@ -713,12 +707,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) @@ -726,8 +717,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) @@ -808,7 +797,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) diff --git a/README.md b/README.md index 8980f842b..86aa402eb 100644 --- a/README.md +++ b/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) | diff --git a/features/support/env.rb b/features/support/env.rb index 794aa875c..cadd313bc 100644 --- a/features/support/env.rb +++ b/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" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cb810e975..0fe4e1097 100644 --- a/spec/spec_helper.rb +++ b/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" From 8bca84422ecbdc089209a9093869f892fa5701fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 2 Nov 2020 16:23:35 +0100 Subject: [PATCH 2/3] cucumber: don't fail on flaky tests, fail-fast --- .github/workflows/ci.yml | 1 - lib/tasks/cucumber.rake | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac4473975..8459f200f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,6 @@ jobs: test: runs-on: ubuntu-latest strategy: - fail-fast: false matrix: ruby: - 2.6 diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake index 0b79485bb..815d35f6a 100644 --- a/lib/tasks/cucumber.rake +++ b/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 -# newer version of cucumber-rails. Consider adding your own code to a new file +# 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 # 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| From 6f3d68110a53389cbdec0c8c730cf1f956e56648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 2 Nov 2020 17:54:34 +0100 Subject: [PATCH 3/3] bump jasmine to 3.6.0 closes #8179 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 883c0996b..88545c5bc 100644 --- a/Gemfile +++ b/Gemfile @@ -304,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" diff --git a/Gemfile.lock b/Gemfile.lock index 9b1e35a3d..0d12d143f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,12 +337,12 @@ GEM railties (>= 3.0.0) ipaddress (0.8.3) jaro_winkler (1.5.4) - jasmine (3.5.1) - jasmine-core (~> 3.5.0) + jasmine (3.6.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) @@ -825,7 +825,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)