diff options
| author | Peter Melnichenko <mpeterval@gmail.com> | 2016-07-09 16:35:33 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-09 16:35:33 +0400 |
| commit | 8e55688c191827a9b2e9c499a95c888078979e8c (patch) | |
| tree | aeaf8c1886c949e8e357b59a04cebc3be3930bce /spec/make_spec.lua | |
| parent | 5af7e0d7c2dcf65e41ae8523f3771e9528be32a7 (diff) | |
| parent | a05ba7ce42ae4e42f80b5cacdd8770ae5e6cc04b (diff) | |
| download | luarocks-8e55688c191827a9b2e9c499a95c888078979e8c.tar.gz luarocks-8e55688c191827a9b2e9c499a95c888078979e8c.tar.bz2 luarocks-8e55688c191827a9b2e9c499a95c888078979e8c.zip | |
Merge pull request #583 from mpeterv/adjust-new-tests
Minor changes and fixes for new test suite
Diffstat (limited to 'spec/make_spec.lua')
| -rw-r--r-- | spec/make_spec.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/make_spec.lua b/spec/make_spec.lua index f70bb7e9..2821c143 100644 --- a/spec/make_spec.lua +++ b/spec/make_spec.lua | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | local test_env = require("test/test_environment") | 1 | local test_env = require("test/test_environment") |
| 2 | local lfs = require("lfs") | 2 | local lfs = require("lfs") |
| 3 | local run = test_env.run | ||
| 4 | local testing_paths = test_env.testing_paths | ||
| 3 | 5 | ||
| 4 | test_env.unload_luarocks() | 6 | test_env.unload_luarocks() |
| 5 | local make = require("luarocks.make") | ||
| 6 | 7 | ||
| 7 | local extra_rocks = { | 8 | local extra_rocks = { |
| 8 | "/lpeg-0.12-1.src.rock", | 9 | "/lpeg-0.12-1.src.rock", |
| @@ -12,12 +13,10 @@ local extra_rocks = { | |||
| 12 | "/lxsh-0.8.6-2.rockspec" | 13 | "/lxsh-0.8.6-2.rockspec" |
| 13 | } | 14 | } |
| 14 | 15 | ||
| 15 | expose("LuaRocks make tests #blackbox #b_make", function() | 16 | describe("LuaRocks make tests #blackbox #b_make", function() |
| 16 | 17 | ||
| 17 | before_each(function() | 18 | before_each(function() |
| 18 | test_env.setup_specs(extra_rocks) | 19 | test_env.setup_specs(extra_rocks) |
| 19 | run = test_env.run | ||
| 20 | testing_paths = test_env.testing_paths | ||
| 21 | end) | 20 | end) |
| 22 | 21 | ||
| 23 | it("LuaRocks make with no flags/arguments", function() | 22 | it("LuaRocks make with no flags/arguments", function() |
| @@ -96,4 +95,4 @@ expose("LuaRocks make tests #blackbox #b_make", function() | |||
| 96 | assert.is.truthy(lfs.attributes("lxsh-0.8.6-2.all.rock")) | 95 | assert.is.truthy(lfs.attributes("lxsh-0.8.6-2.all.rock")) |
| 97 | end) | 96 | end) |
| 98 | end) | 97 | end) |
| 99 | end) \ No newline at end of file | 98 | end) |
