Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5a4bcb2dc6d7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9982637a58a7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 5, 2014

  1. Add missing __FILE__.rb for ScriptingContainerTest.

    @headius
    headius committed Dec 5, 2014
    Copy the full SHA
    7407560 View commit details

  2. Typo.

    @headius
    headius committed Dec 5, 2014
    Copy the full SHA
    9982637 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
  2. +1 −0 core/src/test/ruby/__FILE__.rb
2 changes: 1 addition & 1 deletion core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
View file
Original file line number Diff line number Diff line change
@@ -2752,7 +2752,7 @@ public void testExitTerminatesScript() {
}

@Test
public void testClasspathScriptletHashClasspathFile() {
public void testClasspathScriptletHasClasspathFile() {
ScriptingContainer instance = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
Object result = instance.runScriptlet(PathType.CLASSPATH, "__FILE__.rb");
assertEquals("classpath:/__FILE__.rb", result.toString());
1 change: 1 addition & 0 deletions core/src/test/ruby/__FILE__.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__FILE__