Permalink
Browse files

Merge branch 'master' of github.com:jnicklas/evergreen

  • Loading branch information...
2 parents 29e789c + 789b814 commit 99ece707f30a5de867289920acb4e122b656eb0f Jonas Nicklas and Kim Burgestrand committed Nov 29, 2011
Showing with 25 additions and 6 deletions.
  1. +10 −0 .travis.yml
  2. +2 −1 evergreen.gemspec
  3. +12 −4 lib/evergreen/views/run.erb
  4. +1 −1 spec/suite1/spec/javascripts/templates_spec.js
View
@@ -0,0 +1,10 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ruby-head
+before_script:
+ - 'git submodule update --init'
+ - 'sh -e /etc/init.d/xvfb start'
+env:
+ - DISPLAY=':99.0'
View
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("coffee-script")
s.add_development_dependency('rspec', ['~> 2.0'])
- s.add_development_dependency('capybara-webkit', ['>= 1.0.0.beta4'])
+ s.add_development_dependency('capybara-webkit', ['~>0.7'])
s.add_development_dependency('therubyracer', ['~> 0.9'])
+ s.add_development_dependency('rake')
end
@@ -32,10 +32,18 @@
<% @suite.templates.each do |template| %>
Evergreen.templates[<%= template.name.to_json %>] = <%= template.escaped_contents %>;
<% end %>
- var jasmineEnv = jasmine.getEnv();
- jasmineEnv.addReporter(new jasmine.TrivialReporter());
- jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
- jasmineEnv.execute();
+ var jasmineExecute = function() {
+ var jasmineEnv = jasmine.getEnv();
+ jasmineEnv.addReporter(new jasmine.TrivialReporter());
+ jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
+ jasmineEnv.execute();
+ };
+ if (window.addEventListener) {
+ window.addEventListener("load", jasmineExecute, false);
+ }
+ else {
+ window.attachEvent("onload", jasmineExecute);
+ }
})();
// ]]>
</script>
@@ -47,6 +47,6 @@ describe('stylesheet', function() {
template('one_template.html')
it("should style the template", function() {
- expect(document.getElementById('from-template').offsetWidth).toEqual(300)
+ expect($('#from-template').css('width')).toEqual('300px')
});
});

0 comments on commit 99ece70

Please sign in to comment.