From b5fc279d1b6140ba826ab4438cac368d02841755 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 29 Oct 2018 09:12:20 +0900
Subject: [PATCH] Combine system environment tests and add zsh

---
 release.nix                       |  3 +--
 tests/system-environment-bash.nix | 10 ----------
 tests/system-environment-fish.nix | 10 ----------
 tests/system-environment.nix      | 18 ++++++++++++++++++
 4 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 tests/system-environment-bash.nix
 delete mode 100644 tests/system-environment-fish.nix
 create mode 100644 tests/system-environment.nix

diff --git a/release.nix b/release.nix
index a7016b71..a6d21e6f 100644
--- a/release.nix
+++ b/release.nix
@@ -108,8 +108,7 @@ let
     tests.services-synergy = makeTest ./tests/services-synergy.nix;
     tests.services-privoxy = makeTest ./tests/services-privoxy.nix;
     tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
-    tests.system-environment-bash = makeTest ./tests/system-environment-bash.nix;
-    tests.system-environment-fish = makeTest ./tests/system-environment-fish.nix;
+    tests.system-environment = makeTest ./tests/system-environment.nix;
     tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
     tests.system-packages = makeTest ./tests/system-packages.nix;
     tests.system-path = makeTest ./tests/system-path.nix;
diff --git a/tests/system-environment-bash.nix b/tests/system-environment-bash.nix
deleted file mode 100644
index 158bdbf9..00000000
--- a/tests/system-environment-bash.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-   programs.bash.enable = true;
-
-   test = ''
-     echo checking setEnvironment in /etc/bashrc >&2
-     fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/bashrc
-   '';
-}
diff --git a/tests/system-environment-fish.nix b/tests/system-environment-fish.nix
deleted file mode 100644
index e1873b35..00000000
--- a/tests/system-environment-fish.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-   programs.fish.enable = true;
-
-   test = ''
-     echo checking setEnvironment in /etc/fish/config.fish >&2
-     grep 'fenv source ${config.system.build.setEnvironment}' ${config.out}/etc/fish/nixos-env-preinit.fish
-   '';
-}
diff --git a/tests/system-environment.nix b/tests/system-environment.nix
new file mode 100644
index 00000000..7ed13b15
--- /dev/null
+++ b/tests/system-environment.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+{
+   programs.bash.enable = true;
+   programs.fish.enable = true;
+   programs.zsh.enable = true;
+
+   test = ''
+     echo checking setEnvironment in /etc/bashrc >&2
+     fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/bashrc
+
+     echo checking setEnvironment in /etc/fish/nixos-env-preinit.fish >&2
+     grep 'fenv source ${config.system.build.setEnvironment}' ${config.out}/etc/fish/nixos-env-preinit.fish
+
+     echo checking setEnvironment in /etc/zshenv >&2
+     fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/zshenv
+   '';
+}