discourse.tests: Test the appropriate discourse package
Perform the tests on the package that the `tests` attribute is a child of, i.e. if `discourseAllPlugins.tests` is built, the tests will run with the `discourseAllPlugins` package, not the `discourse` package as previously. (cherry picked from commit 6fd5a40ccaf0b4da1362803a387bf46d381dd66a)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript
|
||||
{ stdenv, pkgs, makeWrapper, runCommandNoCC, lib, writeShellScript
|
||||
, fetchFromGitHub, bundlerEnv, callPackage
|
||||
|
||||
, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk
|
||||
@@ -6,7 +6,7 @@
|
||||
, redis, postgresql, which, brotli, procps, rsync, nodePackages, v8
|
||||
|
||||
, plugins ? []
|
||||
}:
|
||||
}@args:
|
||||
|
||||
let
|
||||
version = "2.7.7";
|
||||
@@ -292,7 +292,7 @@ let
|
||||
enabledPlugins = plugins;
|
||||
plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; };
|
||||
ruby = rubyEnv.wrappedRuby;
|
||||
tests = nixosTests.discourse;
|
||||
tests = import ../../../../nixos/tests/discourse.nix { package = pkgs.discourse.override args; };
|
||||
};
|
||||
};
|
||||
in discourse
|
||||
|
||||
Reference in New Issue
Block a user