wgroeneveld
/
jasmine-junit-runner
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/jefklak/jasmine-junit-runner

This commit is contained in:
Wouter Groeneveld 2011-12-20 22:16:09 +01:00
parent 11b747ccec ed4e0bc98f
commit 8bd88b62dd
2 changed files with 217 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/be/klak/junit/jasmine/JasmineTestRunner.java
View File

@ -22,8 +22,8 @@ public class JasmineTestRunner extends Runner {
private JasmineDescriptions jasmineSuite;
private final RhinoContext rhinoContext;
private final JasmineSuite suiteAnnotation;
protected final RhinoContext rhinoContext;
protected final JasmineSuite suiteAnnotation;
private final Class<?> testClass;
@JasmineSuite
@ -48,6 +48,9 @@ public class JasmineTestRunner extends Runner {
private RhinoContext setUpRhinoScope() {
RhinoContext context = new RhinoContext();
pre(context);
context.loadEnv(suiteAnnotation.jsRootDir());
setUpJasmine(context);
@ -56,6 +59,9 @@ public class JasmineTestRunner extends Runner {
return context;
}
protected void pre(RhinoContext context) {
}
private void setUpJasmine(RhinoContext context) {
context.load(getJsLibDir() + "jasmine.js");
context.load(getJsLibDir() + "jasmine.delegator_reporter.js");
@ -138,9 +144,14 @@ public class JasmineTestRunner extends Runner {
}
}
after();
}
protected void after() {
this.rhinoContext.exit();
}
private Object createTestClassInstance() {
try {
return testClass.newInstance();

2
src/test/javascript/lib/jasmine-1.0.2/jasmine-jquery-rhino.js
View File

@ -138,7 +138,7 @@ jasmine.JQuery.matchersClass = {};
},
toBeDisabled: function(selector) {
return this.actual.attr("disabled") == true;
return this.actual.is(':disabled');
}
};