Commit Graph

245 Commits

Author SHA1 Message Date
John Bintz
47f6fead79 Merge pull request #57 from marcpeabody/master
Mac install issue fixed
2011-08-22 06:11:40 -07:00
Marc Peabody
9146041ce6 Inconsistent darwin/mac_os_x symbol bug
It was causing:
lib/qt/qmake.rb:114:in `check_qmake!': undefined method `strip' for nil:NilClass (NoMethodError)
2011-08-21 21:55:32 -04:00
John Bintz
350db80eed bump version 2011-08-12 10:22:21 -04:00
John Bintz
2a1d986f19 ensure rubygems is loaded, should fix #49 2011-08-11 14:15:42 -04:00
John Bintz
6a06d87a4c special case for when logging jquery nodes -- print the html 2011-08-11 13:07:48 -04:00
John Bintz
dc5b8c026d better errors and flatten jasmine.yml keys, allowing for merged yaml sequences in config 2011-08-10 13:11:05 -04:00
John Bintz
88d1b7f1d2 bump version and fix rake task 2011-08-10 09:02:11 -04:00
John Bintz
f094aeabc6 remove a flaky test 2011-08-10 08:55:38 -04:00
John Bintz
77a14311aa don't process any more specs when there's an error, makes the output make more sense on super-fast computers when errors occur 2011-08-07 14:45:57 -04:00
John Bintz
96c69f3def nuke the hydra stuff 2011-08-07 00:49:12 -04:00
John Bintz
30ce01c017 this caching is too dangerous 2011-08-07 00:17:45 -04:00
John Bintz
bb92628716 set up hydra for testing 2011-08-04 10:38:52 -04:00
John Bintz
680f66db6e Merge branch 'master' of github.com:johnbintz/jasmine-headless-webkit 2011-08-04 10:19:51 -04:00
John Bintz
572d2a8b5a ensure bad utf-8 is handled, fixes #48 2011-08-04 10:18:05 -04:00
John Bintz
4fb82c2e7c more qt testing work 2011-08-03 12:26:39 -04:00
John Bintz
1de9307c5d Merge pull request #47 from rapportive-oss/master
Patch to allow running specs containing UTF-8
2011-08-03 05:23:03 -07:00
Sam Stokes
7af9e353af Set test harness to UTF-8 to allow running UTF-8 spec source files 2011-08-02 20:28:39 -07:00
John Bintz
370eb182d8 trying stuff 2011-08-02 15:47:14 -04:00
John Bintz
22577e0fdc qt cleanup 2011-08-02 10:20:18 -04:00
John Bintz
60713fc88f start c++ cleanup 2011-08-01 13:09:08 -04:00
John Bintz
316383671a Merge pull request #44 from dcuddeback/master
Fix for issue #43: unitialized constant during `rake` for Rails 2.3 applications
2011-07-29 18:35:08 -07:00
John Bintz
37c4e2e52b better qt finding 2011-07-29 21:33:19 -04:00
David Cuddeback
14c3c13699 Fix compatibility for Rails 2.3 2011-07-29 12:01:40 -07:00
John Bintz
11c2cbc950 um, what was i thinking? 2011-07-29 09:58:59 -04:00
John Bintz
93e189545c bump version 2011-07-26 16:40:01 -04:00
John Bintz
32d2c59f4c changelog 2011-07-26 16:34:43 -04:00
John Bintz
477fc437ce Merge pull request #41 from Absolight/6a4d426109696cd0ffa5f79707e3132e7674ea89
have it compile on FreeBSD
2011-07-25 08:07:36 -07:00
Mathieu Arnold
6a4d426109 Make it compile on FreeBSD. 2011-07-25 15:29:07 +02:00
John Bintz
2c27d6b6b3 handle when forms try to leave, too 2011-07-22 12:48:51 -04:00
John Bintz
8a5121bd90 small clenaup and ensure form submits don't trigger loops, either 2011-07-22 09:40:40 -04:00
John Bintz
d08fb1d445 changelog 2011-07-22 07:48:19 -04:00
John Bintz
f96a0e3d76 Merge branch 'master' of github.com:johnbintz/jasmine-headless-webkit 2011-07-22 07:47:54 -04:00
John Bintz
13bcd5226e ensure a spec can't leave the page, causing a craaaazy loop 2011-07-22 07:42:25 -04:00
John Bintz
b97c8f8954 Merge pull request #39 from olivoil/master
require yaml in runner.rb
2011-07-20 15:54:54 -07:00
Olivier Melcher
8f98da4767 require yaml in runner.rb
fixes bad YAML module look-up that would give the following error:

[jasmine-headless-webkit] uninitialized constant Jasmine::Headless::Runner::YAML (NameError)
/gems/jasmine-headless-webkit-0.6.0/lib/jasmine/headless/runner.rb:47:in `jasmine_config'
2011-07-20 15:27:20 -07:00
John Bintz
fe18d2a3fd bump version 2011-07-20 09:30:30 -04:00
John Bintz
f9e3bdfbce merge in changes 2011-07-20 09:28:45 -04:00
John Bintz
f77bfb1705 changelog and minor version bump 2011-07-20 09:26:01 -04:00
John Bintz
132d9355bd changes and hooks and junk 2011-07-19 10:47:24 -04:00
John Bintz
4c7e03dc57 we don't need all of jasmine, just jasmine-core 2011-07-19 10:41:23 -04:00
John Bintz
75f4d26344 better handling of rails version checks 2011-07-19 10:29:25 -04:00
John Bintz
21d93e7c9f set application name to silence phonon warnings 2011-07-19 09:54:39 -04:00
John Bintz
b03e6d8298 Merge branch 'master' of github.com:johnbintz/jasmine-headless-webkit 2011-07-18 10:54:48 -04:00
John Bintz
879975a8ca better qt building? 2011-07-18 10:52:57 -04:00
John Bintz
4b154128ed Merge pull request #37 from ConradIrwin/master
-c/--no-colors are broken.
2011-07-15 19:54:33 -07:00
Conrad Irwin
f4a8458246 Respect the showColors option... 2011-07-15 18:07:43 -07:00
John Bintz
da08c96af6 changelog 2011-07-15 17:45:26 -04:00
John Bintz
b723d015bc Merge branch 'master' of github.com:johnbintz/jasmine-headless-webkit 2011-07-15 17:44:34 -04:00
John Bintz
154372e130 add in JHW self-tests to default task 2011-07-15 17:44:03 -04:00
John Bintz
efd8150a55 have runner tried to build qtwebkit widget if it's missing 2011-07-14 16:23:29 -04:00