Tests: disable insulation and use describe() instead of expose()

25 files changed, 26 insertions, 25 deletions

diff --git a/.busted b/.busted
index 7c67e719..29a8137b 100644
--- a/.busted
+++ b/.busted
@@ -1,5 +1,6 @@
 return {
    default = {
-      helper = "test/test_environment"
+      helper = "test/test_environment",
+      ["auto-insulate"] = false
    }
 }
diff --git a/spec/add_spec.lua b/spec/add_spec.lua
index 5d020859..930c221d 100644
--- a/spec/add_spec.lua
+++ b/spec/add_spec.lua
@@ -7,7 +7,7 @@ local extra_rocks = {
    "/luasocket-3.0rc1-1.rockspec"
 }
 
-expose("LuaRocks add tests #blackbox #b_add", function()
+describe("LuaRocks add tests #blackbox #b_add", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index ee88cce4..7248e8f0 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -25,7 +25,7 @@ local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
 }
 
-expose("LuaRocks build tests #blackbox #b_build", function()
+describe("LuaRocks build tests #blackbox #b_build", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index a7842811..df2480ac 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -3,7 +3,7 @@ local lfs = require("lfs")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks config tests #blackbox #b_config", function()
+describe("LuaRocks config tests #blackbox #b_config", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/deps_spec.lua b/spec/deps_spec.lua
index 3a0cda74..9bb4709d 100644
--- a/spec/deps_spec.lua
+++ b/spec/deps_spec.lua
@@ -11,7 +11,7 @@ local extra_rocks = {
    "/lpeg-0.12-1.src.rock"
 }
 
-expose("LuaRocks deps tests #blackbox #b_deps", function()
+describe("LuaRocks deps tests #blackbox #b_deps", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/doc_spec.lua b/spec/doc_spec.lua
index d0d6ff1e..e4e7f5f2 100644
--- a/spec/doc_spec.lua
+++ b/spec/doc_spec.lua
@@ -6,7 +6,7 @@ local extra_rocks = {
   "/luarepl-0.4-1.src.rock"
 }
 
-expose("LuaRocks doc tests #blackbox #b_doc", function()
+describe("LuaRocks doc tests #blackbox #b_doc", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/download_spec.lua b/spec/download_spec.lua
index d1216d33..2485960d 100644
--- a/spec/download_spec.lua
+++ b/spec/download_spec.lua
@@ -7,7 +7,7 @@ local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
 }
 
-expose("LuaRocks download tests #blackbox #b_download", function()
+describe("LuaRocks download tests #blackbox #b_download", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/help_spec.lua b/spec/help_spec.lua
index 08f6f1f1..376b6ceb 100644
--- a/spec/help_spec.lua
+++ b/spec/help_spec.lua
@@ -2,7 +2,7 @@ local test_env = require("test/test_environment")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks help tests #blackbox #b_help", function()
+describe("LuaRocks help tests #blackbox #b_help", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index a598f324..f8869791 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -18,7 +18,7 @@ local extra_rocks = {
    "/wsapi-1.6-1.src.rock"
 }
 
-expose("LuaRocks install tests #blackbox #b_install", function()
+describe("LuaRocks install tests #blackbox #b_install", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/lint_spec.lua b/spec/lint_spec.lua
index 58c87c4e..ce753618 100644
--- a/spec/lint_spec.lua
+++ b/spec/lint_spec.lua
@@ -6,7 +6,7 @@ local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
 }
 
-expose("LuaRocks lint tests #blackbox #b_lint", function()
+describe("LuaRocks lint tests #blackbox #b_lint", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/list_spec.lua b/spec/list_spec.lua
index edc310ca..344607e3 100644
--- a/spec/list_spec.lua
+++ b/spec/list_spec.lua
@@ -7,7 +7,7 @@ local extra_rocks = {
    "/say-1.2-1.src.rock"
 }
 
-expose("LuaRocks list tests #blackbox #b_list", function()
+describe("LuaRocks list tests #blackbox #b_list", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/make_manifest_spec.lua b/spec/make_manifest_spec.lua
index a5b19eff..c6b0753c 100644
--- a/spec/make_manifest_spec.lua
+++ b/spec/make_manifest_spec.lua
@@ -2,7 +2,7 @@ local test_env = require("test/test_environment")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
+describe("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
         
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index b0177fc5..5ae23fd5 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -11,7 +11,7 @@ local extra_rocks = {
    "/lxsh-0.8.6-2.rockspec"
 }
 
-expose("LuaRocks make tests #blackbox #b_make", function()
+describe("LuaRocks make tests #blackbox #b_make", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 685d31b4..140c9906 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -7,7 +7,7 @@ local extra_rocks = {
    "/abelhas-1.0-1.rockspec"
 }
 
-expose("LuaRocks new_version tests #blackbox #b_new_version", function()
+describe("LuaRocks new_version tests #blackbox #b_new_version", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua
index 39d8bc5c..1671152c 100644
--- a/spec/pack_spec.lua
+++ b/spec/pack_spec.lua
@@ -9,7 +9,7 @@ local extra_rocks = {
         "/luasocket-3.0rc1-1.rockspec"
 }
 
-expose("LuaRocks pack tests #blackbox #b_pack", function()
+describe("LuaRocks pack tests #blackbox #b_pack", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/path_spec.lua b/spec/path_spec.lua
index cffc186b..d201f337 100644
--- a/spec/path_spec.lua
+++ b/spec/path_spec.lua
@@ -2,7 +2,7 @@ local test_env = require("test/test_environment")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks path tests #blackbox #b_path", function()
+describe("LuaRocks path tests #blackbox #b_path", function()
    before_each(function()
       test_env.setup_specs(extra_rocks)
       run = test_env.run
diff --git a/spec/purge_spec.lua b/spec/purge_spec.lua
index f5515cb5..30ce15e2 100644
--- a/spec/purge_spec.lua
+++ b/spec/purge_spec.lua
@@ -2,7 +2,7 @@ local test_env = require("test/test_environment")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks purge tests #blackbox #b_purge", function()   
+describe("LuaRocks purge tests #blackbox #b_purge", function()
    before_each(function()
       test_env.setup_specs(extra_rocks)
       testing_paths = test_env.testing_paths
diff --git a/spec/refresh_cache_spec.lua b/spec/refresh_cache_spec.lua
index ef8c3a12..764cbcb5 100644
--- a/spec/refresh_cache_spec.lua
+++ b/spec/refresh_cache_spec.lua
@@ -2,7 +2,7 @@ local test_env = require("test/test_environment")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
+describe("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
         
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index 1b3cda7e..4129e755 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -10,7 +10,7 @@ local extra_rocks = {
    "/luasocket-3.0rc1-1.rockspec"
 }
 
-expose("LuaRocks remove tests #blackbox #b_remove", function()
+describe("LuaRocks remove tests #blackbox #b_remove", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/search_spec.lua b/spec/search_spec.lua
index 8e84931b..93e85928 100644
--- a/spec/search_spec.lua
+++ b/spec/search_spec.lua
@@ -6,7 +6,7 @@ local extra_rocks = {
 "/lzlib-0.4.1.53-1.src.rock"
 }
 
-expose("LuaRocks search tests #blackbox #b_search", function()
+describe("LuaRocks search tests #blackbox #b_search", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/show_spec.lua b/spec/show_spec.lua
index c2f70c92..a58eea52 100644
--- a/spec/show_spec.lua
+++ b/spec/show_spec.lua
@@ -2,7 +2,7 @@ local test_env = require("test/test_environment")
 
 test_env.unload_luarocks()
 
-expose("LuaRocks show tests #blackbox #b_show", function()
+describe("LuaRocks show tests #blackbox #b_show", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua
index 3930a583..1e9df811 100644
--- a/spec/unpack_spec.lua
+++ b/spec/unpack_spec.lua
@@ -7,7 +7,7 @@ local extra_rocks = {
    "/cprint-0.1-2.rockspec"
 }
 
-expose("LuaRocks unpack tests #blackbox #b_unpack", function()
+describe("LuaRocks unpack tests #blackbox #b_unpack", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index f0125966..ce998987 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -6,7 +6,7 @@ local extra_rocks = {
    "/lua-cjson-2.1.0-1.src.rock"
 }
 
-expose("LuaRocks upload tests #blackbox #b_upload", function()
+describe("LuaRocks upload tests #blackbox #b_upload", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/util_spec.lua b/spec/util_spec.lua
index 7c22d1cb..7e0289d6 100644
--- a/spec/util_spec.lua
+++ b/spec/util_spec.lua
@@ -1,7 +1,7 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
-expose("Basic tests #blackbox #b_util", function()
+describe("Basic tests #blackbox #b_util", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
diff --git a/spec/write_rockspec_spec.lua b/spec/write_rockspec_spec.lua
index d6e32f15..4c29f204 100644
--- a/spec/write_rockspec_spec.lua
+++ b/spec/write_rockspec_spec.lua
@@ -4,7 +4,7 @@ local lfs = require("lfs")
 test_env.unload_luarocks()
 local write_rockspec = require("luarocks.write_rockspec")
 
-expose("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
+describe("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)