From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aG7gEa2XGGRBmwAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 18:28:13 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0DPgEa2XGGTg+wAAauVa8A (envelope-from ) for ; Mon, 20 Mar 2023 18:28:13 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 14125365FB for ; Mon, 20 Mar 2023 18:28:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJH9-0004cW-Qv; Mon, 20 Mar 2023 13:26:27 -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 1peJH4-0004VI-LN for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:24 -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 1peJH1-0005Sa-8g for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJH1-000426-4v for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 137/223] gnu: ruby-actionpack: Update to 7.0.4.3 and enable test suite. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:19 +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.167933313214787 (code B ref 62196); Mon, 20 Mar 2023 17:26:19 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:25:32 +0000 Received: from localhost ([127.0.0.1]:56125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGG-0003qL-1G for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:32 -0400 Received: from mail-qt1-f177.google.com ([209.85.160.177]:46960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJFG-0003dR-C1 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:24:31 -0400 Received: by mail-qt1-f177.google.com with SMTP id c19so13958656qtn.13 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333070; 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=l7xVtl6SgkgEs102CrB7n4NHuHSD/+9f53KBEDZPprs=; b=lgNstK1HeSGxGLLEqAGmZp3ZwxRe1vbFR24YxJaDvRdGZlBPVHgNmH5hliQJlvBPrF K353tBLy5hwMwAUigZJh1/da/H1HUFTj3iJGwBxXNN6G1lU8zHwaJtdEzcfprm+Hg459 0OpthKY40UDRe8BoNGxUKO7NLns72DdInEqb4SEiVNIoZ5K6dzTgkYYnahH6qlFZm1if cjyFfq4xXql0amuwJdTLsn5gj/JWRnR4+IcV+1d/PnsC1p0A0bPrhrK2GdNmaZZrOdcI juu/uBL2VBDUsFq6ls4yP9cAjI9U4uvHa5n8sQqmPk/Sv1iYm8X4AziBj1oGRhZ+QFCu 08dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333070; 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=l7xVtl6SgkgEs102CrB7n4NHuHSD/+9f53KBEDZPprs=; b=go+RR1htL0flu5VDHs4x0NLgrggrZdsTJ3f4wlrA/9kvMJrHFLkqU2ov4b2DVWEbyu JakA/UvZfQPdNuzfV1gM4HbJ8UysnFlJuD+RQ6BDA9UGQn0GbHR5LyYOeTY6LmaEstS1 qMqjly93KomZYjG5fq2BGsQdWgPorfYsyL0QL5wSRlhg4kZad59KvR1/laU2HDssv5MG 4CithaN8+7awZd+rARvAKCt2okauRU1/zIIl64aC4oiJ26FnOSm4chYwWsjbcZl7gmZT heUsmilqSf80LzSEyQQG0ig67ZhVxKmMXwuaR4jHpALMOVOGP4iFaYXlysI8yV/PpM3l jKaw== X-Gm-Message-State: AO0yUKUdSvnCq3DTV/IVKJL8KXNtfOud+uyJyVmx9ti0+Foh+fY4aS9w FH8qzWPZi5JgpbqA1f1uMBxuJDG0x14= X-Google-Smtp-Source: AK7set8umMFPGxa0xKZ6xPnG/JB3L3BR6ZU8qjkRGayOgRpWMR96HQXgfAxUjr7FBlXxsEyIETQP1w== X-Received: by 2002:ac8:7e8c:0:b0:3b6:3a58:912d with SMTP id w12-20020ac87e8c000000b003b63a58912dmr126212qtj.0.1679333069475; Mon, 20 Mar 2023 10:24:29 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id i7-20020a378607000000b007422eee8058sm7769352qkd.125.2023.03.20.10.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:29 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:23 -0400 Message-Id: <20230320172349.12752-36-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172349.12752-1-maxim.cournoyer@gmail.com> References: <20230320172349.12752-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679333293; a=rsa-sha256; cv=none; b=ZDUlXygkec/FQ5WTJaI7NXtNyhwOfcI0rOL6/vy8QaYmTi2MLPCccyeK1RRoYiDMPfelTP NwrQ810yNxcLHsuqKHFY4XeI4AGYoM54OxbUpySsU4w7jve9MwWL9nsor1iBvyM7hLLYDd 8pj1+VMTBlF+YMwW5NKI97z/Cg4WG1B3yS8XMFjDXMsgsui+BCIs9MO2LdTiM250CjMbID /N6nEpX7+1XOAj74zkmdafnpaEEJJBx9Px3UqIIhg2I5ZWKeZc5mUW2QG9tDCcKk+c9W0s de6NKfqsMNZ5K+XLeD5VdqwwDz1Aec6En0gDx1lZC1skYj2Sc45azRwz8rFEKg== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=lgNstK1H; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679333293; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=l7xVtl6SgkgEs102CrB7n4NHuHSD/+9f53KBEDZPprs=; b=gs5YVL+wUvY8xG3VEDzbjomiZVzaunGE6osxgbWF6VQOLsfI0bgFrFIiGw/m/NikuUY7rn Lezt27E2ZkEBwLvwN2Lagg92xzuGUEUKmO66jd3n2v8nNwVMoj6U8FcjeigFkmEe3Ot3Th fTpPVntON5eHJCOP3mK6s+Nr3takheHgQKBNGwDg/yDpoINPEoFfG52tkQz6e4cb6yS0bn 08S/T3xNdyWzmNAlDbD2yLXZw8zeFAKmr2XGxOCKIlCfYAey0krIeEz3X6n6MeRSPOWr6O RqDdbw+fXofMogK1fvoym47LA1ZcxQh5Bot5Ve0gItdmaT7Occ9Iy1HGvOXfFA== X-Migadu-Spam-Score: 6.24 X-Spam-Score: 6.24 X-Migadu-Queue-Id: 14125365FB Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=lgNstK1H; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: ycMP+/dI4VtD * gnu/packages/rails.scm (ruby-actionpack): Update to 7.0.4.3. [source]: Use ruby-rails-monorepo. [arguments]: Delete #:tests? argument. Add #:phases argument. [native-inputs]: New field. [propagated-inputs]: Add ruby-rack-cache and ruby-rack-session. --- gnu/packages/rails.scm | 106 +++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 25 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index bff4e09264..d3712a93c9 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -468,32 +468,88 @@ (define-public ruby-actionview (define-public ruby-actionpack (package - (name "ruby-actionpack") - (version "6.1.3") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "actionpack" version)) - (sha256 - (base32 - "030yyaskzlic5cp4d9zbwwr3rhf4k6hsls44a7ihsfd6r8mlivq5")))) - (build-system ruby-build-system) - (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list ruby-actionview - ruby-activesupport - ruby-rack - ruby-rack-test - ruby-rails-dom-testing - ruby-rails-html-sanitizer)) - (synopsis "Conventions for building and testing MVC web applications") - (description - "ActionPack provides conventions for building and testing MVC web + (name "ruby-actionpack") + (version %ruby-rails-version) + (source ruby-rails-monorepo) + (build-system ruby-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'chdir + (lambda _ + (chdir "actionpack"))) + (add-before 'check 'delete-problematic-tests + (lambda _ + (let-syntax ((skip-tests + (syntax-rules () + ((_ file test ...) + (substitute* file + ;; ActiveSupport test case. + (((string-append "test \"" test "\".*") all) + (string-append + all " skip 'fails on guix'\n")) ... + ;; MiniTest test case. + (((string-append "def " test ".*") all) + (string-append + all " skip('fails on guix')\n")) ...))))) + + (with-directory-excursion "test" + (for-each delete-file + ;; These tests depend on rails, which depends on + ;; this package. + '("dispatch/mount_test.rb" + "dispatch/prefix_generation_test.rb" + "dispatch/routing_assertions_test.rb" + "dispatch/routing/inspector_test.rb" + "controller/live_stream_test.rb" + "controller/integration_test.rb" + "controller/test_case_test.rb")) + + ;; The following test failures have been reported upstream + ;; (see: https://github.com/rails/rails/issues/47615). + (skip-tests "controller/new_base/render_streaming_test.rb" + ;; These tests fail due to white space + ;; characters in the compared strings. + "rendering with streaming no layout" + "rendering with streaming enabled at the \ +class level" + "rendering with streaming given to render" + "rendering with layout exception" + "rendering with template exception" + "rendering with streaming do not override \ +explicit cache control given to render") + + (skip-tests "dispatch/system_testing/driver_test.rb" + ;; These tests require Firefox. + "define extra capabilities using headless_firefox" + "define extra capabilities using firefox") + + (skip-tests "dispatch/session/cache_store_test.rb" + ;; This test fails with: "NoMethodError: + ;; undefined method `hash_for' for + ;; #". + "test_getting_session_value_after_session_reset")))))))) + (native-inputs + (list ruby-activemodel + ruby-capybara + ruby-selenium-webdriver + ruby-zeitwerk)) + (propagated-inputs + (list ruby-actionview + ruby-activesupport + ruby-rack + ruby-rack-cache + ruby-rack-session + ruby-rack-test + ruby-rails-dom-testing + ruby-rails-html-sanitizer)) + (synopsis "Conventions for building and testing MVC web applications") + (description + "ActionPack provides conventions for building and testing MVC web applications. These work with any Rack-compatible server.") - (home-page "https://rubyonrails.org/") - (license license:expat))) + (home-page "https://rubyonrails.org/") + (license license:expat))) (define-public ruby-actioncable (package -- 2.39.1