From patchwork Mon Mar 20 17:29:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48354 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 178D516F42; Mon, 20 Mar 2023 17:31:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 24B8016F1D for ; Mon, 20 Mar 2023 17:31:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJLI-0001rB-2f; Mon, 20 Mar 2023 13:30:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peJKs-00011O-6w for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peJKn-0007Q9-H9 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJKn-0004mk-2z for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 214/223] gnu: ruby-rspec-rails: Update to 6.0.1 and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:30:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933341018336 (code B ref 62196); Mon, 20 Mar 2023 17:30:13 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:30:10 +0000 Received: from localhost ([127.0.0.1]:56392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKj-0004lV-Qs for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:10 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:44621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKX-0004gy-2u for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:29:57 -0400 Received: by mail-qt1-f182.google.com with SMTP id s12so13962438qtq.11 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g+/GJVQ6QDvEir4sSRR/tsw45mWA61jdClhS2BcuT0A=; b=hyO/OmkuBRRXk4gJ5UScR6sUdSHZLfEcvKm9nkoYo4cj+8Hr0or8x7HsU6uZYUbcAk Drb40cTnxBoyaCKCECj7tFEjzTX5tfIpyVgdgsWaLe8mAce7vmqg103J83TAyWDpeG0V u5cVp/R9m1x3RCuzDgNYNYUFdzDJ5gJpdsbzqV3PEWkFYA5li3xGMbba1csbM5BK9qEQ AHw6vgwroewLn7X93sYipHXMPCWKw1QdDO03DU7hd1NiN9FOi6DIN9qOE8G1PuskZ/Ye N9AmjR4zs5cR1UgWtUYguIq/lCjM0dY5OMEsXvMxU6/C8AdowRxnceXCORD9HQW00+QE SCJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g+/GJVQ6QDvEir4sSRR/tsw45mWA61jdClhS2BcuT0A=; b=UbKo5KT5iFYYLIKyxwDZiMVuh3czRJGHwo/mai8Rdzuf0WkPQRXbh0gkbmmsES3vge jQenxX0d//0uYekD3Hcc+yj4m38HALyCdDJbasOWPpOlvTD36IF8qyt2UhI1LuywvrJf r92geOC0SZ1avGH/icCBfTf1c2kdQyfT0WDLXoVPRR36X4LAEKQ4Luhs5e/hFOEMlXM/ A86EULwcEU/RG4F2FeuKpwv55eXCOdZapufvdprEWbtxXBAI9MiZYv4VThPKGj7m/sbe /0npAPYNeCMKk/CROh+gzO0vwP9vfaIwaiC3kzzWjuLB2RvVsegoaq9GCSzOM7yx6rMM bbRw== X-Gm-Message-State: AO0yUKUJcr9JvAWEcqKF3hDe4FMKHlbyyjWHrAd4WiGJZFpqRs8mIpR8 ulc6k0UH09c2+LxkFJuemueGBiVRfys= X-Google-Smtp-Source: AK7set/gVPIGbX7f/wCaUlaENfnDnKjwXxU9TrD/jc5xuW6bmYizCwe8V1qw5yaaeWN+h98FwsqFGA== X-Received: by 2002:a05:622a:1893:b0:3d8:fd72:b4b5 with SMTP id v19-20020a05622a189300b003d8fd72b4b5mr24754536qtc.31.1679333391480; Mon, 20 Mar 2023 10:29:51 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id g2-20020a37b602000000b0071aacb2c76asm7536708qkf.132.2023.03.20.10.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:51 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:24 -0400 Message-Id: <20230320172933.13101-13-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172933.13101-1-maxim.cournoyer@gmail.com> References: <20230320172933.13101-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rails.scm (ruby-rspec-rails): Update to 6.0.1. [source]: Fetch via git. [arguments]: Enable tests. Add #:phases. [native-inputs]: New field. --- gnu/packages/rails.scm | 67 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 4d13615f68..8ca4ac2997 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -350,17 +350,66 @@ (define-public ruby-activerecord (define-public ruby-rspec-rails (package (name "ruby-rspec-rails") - (version "3.8.2") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "rspec-rails" version)) - (sha256 - (base32 - "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1")))) + (version "6.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rspec/rspec-rails") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wmrpwv2vgrwmby01pld6r6sdfa265lb6pd3fp2kifs40nn7ff6b")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ; No included tests + (list + ;; Run the 'spec' instead of the 'default' Rake target to avoid running + ;; the acceptance test suite, which doesn't seem to allow being run + ;; offline (see: https://github.com/rspec/rspec-rails/issues/2660). + #:test-target "spec" + #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'relax-requirements + (lambda _ + (substitute* "Gemfile" + ;; Remove a few extraneous requirements. + ((".*yard.*") "") + ((".*github-markup.*") "") + ((".*redcarpet.*") "") + ((".*relish.*") "") + ((".*rubocop.*") "")) + (substitute* "Gemfile-rspec-dependencies" + ((", :git => \"https://github.com/rspec.*") + "\n")) + (substitute* "Gemfile-rails-dependencies" + (("gem 'puma', '< 6.0.0'") + "gem 'puma', '>= 6.0.0'")) + (substitute* "rspec-rails.gemspec" + (("'aruba', '~> 0.14.12'") + "'aruba', '>= 0.14.12'") + (("'cucumber', '~> 7.0'") + "'cucumber', '>= 7.0'")))) + (replace 'replace-git-ls-files + (lambda _ + (substitute* "rspec-rails.gemspec" + (("`git ls-files -- lib/\\*`") + "`find lib -type f |sort`")))) + (add-before 'check 'patch-tests + (lambda _ + (substitute* "spec/rspec/rails_spec.rb" + (("`git ls-files -z`") + "`find . -type f -not -regex '.*\\.gem$' -print0 | \ +sort -z | cut -zc3-`"))))))) + (native-inputs + (list ruby-ammeter-bootstrap + ruby-aruba + ruby-capybara + ruby-cucumber + ruby-puma + ruby-rails + ruby-rspec + ruby-selenium-webdriver + ruby-sqlite3)) (propagated-inputs (list ruby-actionpack ruby-activesupport