diff options
Diffstat (limited to 'spec/install_spec.lua')
-rw-r--r-- | spec/install_spec.lua | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/spec/install_spec.lua b/spec/install_spec.lua index 7370fef5..5ee913f0 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua | |||
@@ -12,7 +12,6 @@ local extra_rocks = { | |||
12 | "/cprint-0.1-2.src.rock", | 12 | "/cprint-0.1-2.src.rock", |
13 | "/cprint-0.1-2.rockspec", | 13 | "/cprint-0.1-2.rockspec", |
14 | "/lpeg-0.12-1.src.rock", | 14 | "/lpeg-0.12-1.src.rock", |
15 | "/luasec-0.6-1.rockspec", | ||
16 | "/luassert-1.7.0-1.src.rock", | 15 | "/luassert-1.7.0-1.src.rock", |
17 | "/luasocket-3.0rc1-2.src.rock", | 16 | "/luasocket-3.0rc1-2.src.rock", |
18 | "/luasocket-3.0rc1-2.rockspec", | 17 | "/luasocket-3.0rc1-2.rockspec", |
@@ -25,6 +24,9 @@ local extra_rocks = { | |||
25 | "/luafilesystem-1.6.3-1.src.rock", | 24 | "/luafilesystem-1.6.3-1.src.rock", |
26 | "/sailor-0.5-3.src.rock", | 25 | "/sailor-0.5-3.src.rock", |
27 | "/sailor-0.5-4.src.rock", | 26 | "/sailor-0.5-4.src.rock", |
27 | "spec/fixtures/a_repo/has_build_dep-1.0-1.all.rock", | ||
28 | "spec/fixtures/a_repo/a_build_dep-1.0-1.all.rock", | ||
29 | "spec/fixtures/a_repo/a_rock-1.0-1.src.rock", | ||
28 | } | 30 | } |
29 | 31 | ||
30 | describe("luarocks install #integration", function() | 32 | describe("luarocks install #integration", function() |
@@ -77,8 +79,8 @@ describe("luarocks install #integration", function() | |||
77 | end) | 79 | end) |
78 | 80 | ||
79 | it("installs a package with a dependency", function() | 81 | it("installs a package with a dependency", function() |
80 | assert.is_true(run.luarocks_bool("install luasec " .. test_env.openssl_dirs)) | 82 | assert.is_true(run.luarocks_bool("install has_build_dep")) |
81 | assert.is_true(run.luarocks_bool("show luasocket")) | 83 | assert.is_true(run.luarocks_bool("show a_rock")) |
82 | end) | 84 | end) |
83 | 85 | ||
84 | it("installs a package without its documentation", function() | 86 | it("installs a package without its documentation", function() |
@@ -135,14 +137,11 @@ describe("luarocks install #integration", function() | |||
135 | end) | 137 | end) |
136 | 138 | ||
137 | describe("more complex tests", function() | 139 | describe("more complex tests", function() |
138 | it('luasec with skipping dependency checks', function() | 140 | it('skipping dependency checks', function() |
139 | assert.is_true(run.luarocks_bool("install luasec " .. test_env.openssl_dirs .. " --nodeps")) | 141 | assert.is_true(run.luarocks_bool("install has_build_dep --nodeps")) |
140 | assert.is_true(run.luarocks_bool("show luasec")) | 142 | assert.is_true(run.luarocks_bool("show has_build_dep")) |
141 | if env_variables.TYPE_TEST_ENV == "minimal" then | 143 | assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/a_rock")) |
142 | assert.is_false(run.luarocks_bool(test_env.quiet("show luasocket"))) | 144 | assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/has_build_dep")) |
143 | assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket")) | ||
144 | end | ||
145 | assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasec")) | ||
146 | end) | 145 | end) |
147 | 146 | ||
148 | it('handle relative path in --tree #632', function() | 147 | it('handle relative path in --tree #632', function() |