Restructuring files

This commit is contained in:
Judson
2017-05-27 15:19:34 -07:00
parent 022be78eb2
commit 998d011e42
13 changed files with 56 additions and 41 deletions
@@ -1,28 +1,9 @@
/*
Run with:
nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace; and cat result
Confusingly, the ideal result ends with something like:
error: build of /nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv failed
*/
{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage }@defs:
{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs:
let
test = import ./testing.nix;
tap = import ./tap-support.nix;
stubs = import ./stubs.nix defs;
should = import ./assertions.nix { inherit test lib; };
basicEnv = callPackage ./basic.nix stubs;
bundlerEnv = callPackage ./default.nix stubs // {
inherit basicEnv;
basicEnv = callPackage ../bundled-common stubs;
};
testConfigs = {
inherit lib;
gemConfig = defaultGemConfig;
};
functions = (import ./functions.nix testConfigs);
justName = bundlerEnv {
name = "test-0.1.2";
gemset = ./test/gemset.nix;
@@ -35,21 +16,8 @@ let
gemfile = ./test/Gemfile;
lockfile = ./test/Gemfile.lock;
};
results = builtins.concatLists [
(test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
( let gemSet = { test = { groups = ["x" "y"]; }; };
in
test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
( let gemSet = { test = { platforms = []; }; };
in
test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version.majMin;}]; }; };
in
test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
( let gemSet = { test = { groups = ["x" "y"]; }; };
in
test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {}))
in
builtins.concatLists [
(test.run "bundlerEnv { name }" justName {
name = should.equal "test-0.1.2";
})
@@ -62,6 +30,4 @@ let
postBuild = should.havePrefix "/nix/store";
}
])
];
in
writeText "test-results.tap" (tap.output results)
]