Permalink
Browse files

Moved Kernel#load/#require fixtures to spec/fixtures.

  • Loading branch information...
1 parent 0438e9e commit ddda4d49f5535577c147d2154ecdae7cb4e32e24 @brixen brixen committed Dec 26, 2007
Showing with 17 additions and 17 deletions.
  1. +1 −1 .gitignore
  2. +6 −6 spec/core/kernel/load_spec.rb
  3. +6 −6 spec/core/kernel/require_spec.rb
  4. 0 spec/{core/kernel → }/fixtures/load/.gitignore
  5. 0 spec/{core/kernel → }/fixtures/load/load_spec
  6. 0 spec/{core/kernel → }/fixtures/load/load_spec.rooby
  7. 0 spec/{core/kernel → }/fixtures/load/load_spec_1.rb
  8. 0 spec/{core/kernel → }/fixtures/load/load_spec_10.rb
  9. 0 spec/{core/kernel → }/fixtures/load/load_spec_2.rb
  10. 0 spec/{core/kernel → }/fixtures/load/load_spec_3.rb
  11. 0 spec/{core/kernel → }/fixtures/load/load_spec_4.rb
  12. 0 spec/{core/kernel → }/fixtures/load/load_spec_5.rb
  13. 0 spec/{core/kernel → }/fixtures/load/load_spec_6.rb
  14. 0 spec/{core/kernel → }/fixtures/load/load_spec_7.rb
  15. 0 spec/{core/kernel → }/fixtures/load/load_spec_8.rb
  16. 0 spec/{core/kernel → }/fixtures/load/load_spec_9.rb
  17. 0 spec/{core/kernel → }/fixtures/load/load_spec_wrap.rb
  18. 0 spec/{core/kernel → }/fixtures/load/load_spec_wrap2.rb
  19. 0 spec/{core/kernel → }/fixtures/load/load_spec_wrap_2.rb
  20. 0 spec/{core/kernel → }/fixtures/require/.gitignore
  21. 0 spec/{core/kernel → }/fixtures/require/masked_require_spec_2.rb
  22. 0 spec/{core/kernel → }/fixtures/require/masked_require_spec_3.rb
  23. 0 spec/{core/kernel → }/fixtures/require/require_spec
  24. 0 spec/{core/kernel → }/fixtures/require/require_spec.rb
  25. 0 spec/{core/kernel → }/fixtures/require/require_spec.rooby
  26. 0 spec/{core/kernel → }/fixtures/require/require_spec.rooby.rb
  27. 0 spec/{core/kernel → }/fixtures/require/require_spec_1.rb
  28. 0 spec/{core/kernel → }/fixtures/require/require_spec_10.rb
  29. 0 spec/{core/kernel → }/fixtures/require/require_spec_2.rb
  30. 0 spec/{core/kernel → }/fixtures/require/require_spec_3.rb
  31. 0 spec/{core/kernel → }/fixtures/require/require_spec_4.rb
  32. 0 spec/{core/kernel → }/fixtures/require/require_spec_6.rb
  33. 0 spec/{core/kernel → }/fixtures/require/require_spec_7.rb
  34. 0 spec/{core/kernel → }/fixtures/require/require_spec_8.rb
  35. 0 spec/{core/kernel → }/fixtures/require/require_spec_9.rb
  36. +2 −2 spec/rubinius/core/kernel/load_spec.rb
  37. +2 −2 spec/rubinius/core/kernel/require_spec.rb
View
@@ -13,7 +13,7 @@ tags
tmtags
*.rbc
.spec/bm.yml
-spec/core/kernel/fixtures/load/load_spec_rba.rba
+spec/fixtures/load/load_spec_rba.rba
spec/core/dir/fixtures/mock
tmp
scratch
@@ -1,8 +1,8 @@
require File.dirname(__FILE__) + '/../../spec_helper'
-$load_fixture_dir = (File.dirname(__FILE__) + '/fixtures/load')
+$load_fixture_dir = (File.dirname(__FILE__) + '/../../fixtures/load')
$LOAD_PATH << $load_fixture_dir
-$LOAD_PATH << (File.dirname(__FILE__) + '/fixtures/load/load_spec_rba.rba')
+$LOAD_PATH << (File.dirname(__FILE__) + '/../../fixtures/load/load_spec_rba.rba')
$load_spec_1 = nil
$load_spec_2 = nil
@@ -37,7 +37,7 @@
end
it "loads a .rb from an absolute path and returns true" do
- path = File.expand_path(File.dirname(__FILE__) + '/fixtures/load/load_spec_1.rb')
+ path = File.expand_path(File.dirname(__FILE__) + '/../../fixtures/load/load_spec_1.rb')
load(path).should == true
$load_spec_1.nil?.should == false
@@ -75,7 +75,7 @@
end
it "allows unqualified files to contain path information (just not in the beginning)" do
- name = (File.dirname(__FILE__) + '/fixtures')
+ name = (File.dirname(__FILE__) + '/../../fixtures')
$LOAD_PATH << name
$load_spec_2 = nil
@@ -121,8 +121,8 @@
end
load("#{$load_fixture_dir}/load_spec_4.rb").should == true
- $load_spec_4.should == [['./spec/core/kernel/fixtures/load/load_spec_4.rb', 1],
- ['./spec/core/kernel/fixtures/load/load_spec_4.rb', 10]]
+ $load_spec_4.should == [['./spec/core/kernel/../../fixtures/load/load_spec_4.rb', 1],
+ ['./spec/core/kernel/../../fixtures/load/load_spec_4.rb', 10]]
end
it "reloads the file if invoked on the same filename again, returning true" do
@@ -1,8 +1,8 @@
require File.dirname(__FILE__) + '/../../spec_helper'
-$require_fixture_dir = (File.dirname(__FILE__) + '/fixtures/require')
+$require_fixture_dir = (File.dirname(__FILE__) + '/../../fixtures/require')
$LOAD_PATH << $require_fixture_dir
-$LOAD_PATH << (File.dirname(__FILE__) + '/fixtures/require/require_spec_rba.rba')
+$LOAD_PATH << (File.dirname(__FILE__) + '/../../fixtures/require/require_spec_rba.rba')
$require_spec = nil
$require_spec_1 = nil
@@ -38,7 +38,7 @@
# or add items.
it "loads a .rb from an absolute path and returns true" do
- path = File.expand_path(File.dirname(__FILE__) + '/fixtures/require/require_spec_1.rb')
+ path = File.expand_path(File.dirname(__FILE__) + '/../../fixtures/require/require_spec_1.rb')
require(path).should == true
$require_spec_1.nil?.should == false
@@ -76,7 +76,7 @@
end
it "allows unqualified files to contain path information (just not in the beginning)" do
- name = (File.dirname(__FILE__) + '/fixtures')
+ name = (File.dirname(__FILE__) + '/../../fixtures')
$LOAD_PATH << name
$require_spec2 = nil
@@ -148,8 +148,8 @@
end
require("#{$require_fixture_dir}/require_spec_4").should == true
- $require_spec_4.should == [['./spec/core/kernel/fixtures/require/require_spec_4.rb', 1],
- ['./spec/core/kernel/fixtures/require/require_spec_4.rb', 10]]
+ $require_spec_4.should == [['./spec/core/kernel/../../fixtures/require/require_spec_4.rb', 1],
+ ['./spec/core/kernel/../../fixtures/require/require_spec_4.rb', 10]]
end
it "stores the loaded file in $LOADED_FEATURES" do
@@ -1,9 +1,9 @@
require File.dirname(__FILE__) + '/../../../spec_helper'
extension :rubinius do
- $load_fixture_dir = (File.dirname(__FILE__) + '/../../kernel/fixtures/load')
+ $load_fixture_dir = (File.dirname(__FILE__) + '/../../../fixtures/load')
$LOAD_PATH << $load_fixture_dir
- $LOAD_PATH << (File.dirname(__FILE__) + '/../../kernel/fixtures/load/load_spec_rba.rba')
+ $LOAD_PATH << (File.dirname(__FILE__) + '/../../../fixtures/load/load_spec_rba.rba')
$load_spec_1 = nil
$load_spec_2 = nil
@@ -1,9 +1,9 @@
require File.dirname(__FILE__) + '/../../../spec_helper'
extension :rubinius do
- $require_fixture_dir = (File.dirname(__FILE__) + '/../../kernel/fixtures/require')
+ $require_fixture_dir = (File.dirname(__FILE__) + '/../../../fixtures/require')
$LOAD_PATH << $require_fixture_dir
- $LOAD_PATH << (File.dirname(__FILE__) + '/../../kernel/fixtures/require/require_spec_rba.rba')
+ $LOAD_PATH << (File.dirname(__FILE__) + '/../../../fixtures/require/require_spec_rba.rba')
$require_spec = nil
$require_spec_1 = nil

0 comments on commit ddda4d4

Please sign in to comment.