More unit tests for loading from global directory structure

bash_it.sh

@@ -46,8 +46,6 @@ do
   fi
 done
 
-# TODO Automatically check for content that needs to be migrated
-
 # Load the global "enabled" directory
 _load_global_bash_it_files
 

test/bash_it/bash_it.bats

@@ -110,6 +110,60 @@ function local_teardown {
   assert_line "0" "alias test_alias='c'"
 }
 
+@test "bash-it: load aliases, plugins and completions in priority order" {
+  mkdir -p $BASH_IT/aliases/enabled
+  mkdir -p $BASH_IT/plugins/enabled
+  mkdir -p $BASH_IT/completion/enabled
+
+  ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash
+  assert [ -L "$BASH_IT/plugins/enabled/250---base.plugin.bash" ]
+
+  ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/150---a.aliases.bash
+  assert [ -L "$BASH_IT/aliases/enabled/150---a.aliases.bash" ]
+  ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/completion/enabled/350---b.completion.bash
+  assert [ -L "$BASH_IT/completion/enabled/350---b.completion.bash" ]
+  ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/plugins/enabled/250---c.plugin.bash
+  assert [ -L "$BASH_IT/plugins/enabled/250---c.plugin.bash" ]
+
+  # The `test_alias` alias should not exist
+  run alias test_alias &> /dev/null
+  assert_failure
+
+  load "$BASH_IT/bash_it.sh"
+
+  run alias test_alias &> /dev/null
+  assert_success
+  # "b" wins since completions are loaded last in the old directory structure
+  assert_line "0" "alias test_alias='b'"
+}
+
+@test "bash-it: load aliases, plugins and completions in priority order, even if the priority says otherwise" {
+  mkdir -p $BASH_IT/aliases/enabled
+  mkdir -p $BASH_IT/plugins/enabled
+  mkdir -p $BASH_IT/completion/enabled
+
+  ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash
+  assert [ -L "$BASH_IT/plugins/enabled/250---base.plugin.bash" ]
+
+  ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/450---a.aliases.bash
+  assert [ -L "$BASH_IT/aliases/enabled/450---a.aliases.bash" ]
+  ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/completion/enabled/350---b.completion.bash
+  assert [ -L "$BASH_IT/completion/enabled/350---b.completion.bash" ]
+  ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/plugins/enabled/950---c.plugin.bash
+  assert [ -L "$BASH_IT/plugins/enabled/950---c.plugin.bash" ]
+
+  # The `test_alias` alias should not exist
+  run alias test_alias &> /dev/null
+  assert_failure
+
+  load "$BASH_IT/bash_it.sh"
+
+  run alias test_alias &> /dev/null
+  assert_success
+  # "b" wins since completions are loaded last in the old directory structure
+  assert_line "0" "alias test_alias='b'"
+}
+
 @test "bash-it: load aliases and plugins in priority order, with one alias higher than plugins" {
   mkdir -p $BASH_IT/aliases/enabled
   mkdir -p $BASH_IT/plugins/enabled
@@ -231,6 +285,36 @@ function local_teardown {
   assert_line "0" "alias test_alias='a'"
 }
 
+@test "bash-it: load global aliases and plugins in priority order, individual old directories are loaded later" {
+  mkdir -p $BASH_IT/enabled
+  mkdir -p $BASH_IT/aliases/enabled
+
+  ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash
+  assert [ -L "$BASH_IT/enabled/250---base.plugin.bash" ]
+
+  ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/enabled/350---a.aliases.bash
+  assert [ -L "$BASH_IT/enabled/350---a.aliases.bash" ]
+  ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/enabled/150---b.aliases.bash
+  assert [ -L "$BASH_IT/enabled/150---b.aliases.bash" ]
+  ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/enabled/250---c.plugin.bash
+  assert [ -L "$BASH_IT/enabled/250---c.plugin.bash" ]
+  # Add one file in the old directory structure
+  ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/aliases/enabled/150---b.aliases.bash
+  assert [ -L "$BASH_IT/aliases/enabled/150---b.aliases.bash" ]
+
+  # The `test_alias` alias should not exist
+  run alias test_alias &> /dev/null
+  assert_failure
+
+  load "$BASH_IT/bash_it.sh"
+
+  run alias test_alias &> /dev/null
+  assert_success
+  # This will be "b", loaded from the b aliases in the individual directory, since
+  # the individual directories are loaded after the global one.
+  assert_line "0" "alias test_alias='b'"
+}
+
 @test "bash-it: load enabled aliases from new structure, priority-based" {
   mkdir -p $BASH_IT/enabled
   ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/enabled/150---atom.aliases.bash