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/config_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/config_spec.lua')
| -rw-r--r-- | spec/config_spec.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/config_spec.lua b/spec/config_spec.lua index f6cabd8c..0dee8620 100644 --- a/spec/config_spec.lua +++ b/spec/config_spec.lua | |||
| @@ -1,17 +1,17 @@ | |||
| 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 | ||
| 5 | local site_config | ||
| 3 | 6 | ||
| 4 | test_env.unload_luarocks() | 7 | test_env.unload_luarocks() |
| 5 | local cfg = require("luarocks.cfg") | ||
| 6 | 8 | ||
| 7 | expose("LuaRocks config tests #blackbox #b_config", function() | 9 | describe("LuaRocks config tests #blackbox #b_config", function() |
| 8 | 10 | ||
| 9 | before_each(function() | 11 | before_each(function() |
| 10 | test_env.setup_specs(extra_rocks) | 12 | test_env.setup_specs() |
| 11 | test_env.unload_luarocks() -- need to be required here, because site_config is created after first loading of specs | 13 | test_env.unload_luarocks() -- need to be required here, because site_config is created after first loading of specs |
| 12 | site_config = require("luarocks.site_config") | 14 | site_config = require("luarocks.site_config") |
| 13 | testing_paths = test_env.testing_paths | ||
| 14 | run = test_env.run | ||
| 15 | end) | 15 | end) |
| 16 | 16 | ||
| 17 | describe("LuaRocks config - basic tests", function() | 17 | describe("LuaRocks config - basic tests", function() |
| @@ -87,4 +87,4 @@ expose("LuaRocks config tests #blackbox #b_config", function() | |||
| 87 | test_env.remove_dir(testing_paths.testing_lrprefix) | 87 | test_env.remove_dir(testing_paths.testing_lrprefix) |
| 88 | end) | 88 | end) |
| 89 | end) | 89 | end) |
| 90 | end) \ No newline at end of file | 90 | end) |
