restore untested $LOAD_PATH behavior, add tests, fixes #1463

padrino · Oct 17, 2013 · c5e62743e853e8bb0f29fcfc6c6b4feabc3d9609 · c5e6274
1 parent d549380
commit c5e62743e853e8bb0f29fcfc6c6b4feabc3d9609
Unified Split

Showing with 10 additions and 0 deletions.

+1 −0 padrino-core/lib/padrino-core/loader.rb

+9 −0 padrino-core/test/test_reloader_system.rb
diff --git a/padrino-core/lib/padrino-core/loader.rb b/padrino-core/lib/padrino-core/loader.rb
@@ -169,6 +169,7 @@ def require_dependencies(*paths)
    #
    def set_load_paths(*paths)
      load_paths.concat(paths).uniq!
+      $LOAD_PATH.concat(paths).uniq!
    end

    ##
diff --git a/padrino-core/test/test_reloader_system.rb b/padrino-core/test/test_reloader_system.rb
@@ -39,5 +39,14 @@ def shmamily
        File.open(parent_file, "w") { |f| f.write(backup) }
      end
    end
+    
+    should 'tamper with LOAD_PATH' do
+      SystemDemo.load_paths.each do |lib_dir|
+        assert_includes $LOAD_PATH, lib_dir
+      end
+      Padrino.send(:load_paths_was).each do |lib_dir|
+        assert_includes $LOAD_PATH, lib_dir
+      end
+    end
  end
 end