Commit Graph

399 Commits

Author SHA1 Message Date
John Bintz
3911041866 merge sprockets code into mainline, please report bugs 2011-11-23 09:50:14 -05:00
John Bintz
edf5a49f27 test coverage and cleanup in anticipation of merge 2011-11-23 09:35:44 -05:00
John Bintz
634f60ffe6 fix tests 2011-11-22 14:01:05 -05:00
John Bintz
38327e6a95 more cleanups for things i found that are broken 2011-11-22 12:14:00 -05:00
John Bintz
2316041580 ok i actually want a bundled asset 2011-11-22 10:51:46 -05:00
John Bintz
7d75b5466f whoa actually just plug in sprockets, need to backfill tests later since i have real work to do 2011-11-22 10:36:42 -05:00
John Bintz
130a65ecdd Merge branch 'sprockets-integration' of github.com:johnbintz/jasmine-headless-webkit into sprockets-integration 2011-11-21 20:19:05 -05:00
John Bintz
7206341768 require_self 2011-11-21 20:18:11 -05:00
John Bintz
a9cc872cc8 some cleanup 2011-11-21 17:03:44 -05:00
John Bintz
7ba77ea1f9 dont show the running message if there are compile errors 2011-11-21 16:10:15 -05:00
John Bintz
a18100bb71 move the jquery console test to the right spot 2011-11-21 14:13:15 -05:00
John Bintz
08798ff88d Merge pull request #82 from rocketpack/master
console.log to clone jQuery objects before appending them.
2011-11-21 10:56:49 -08:00
John Bintz
a9b879722b reset version for a release, other branch will be 0.8 2011-11-21 13:52:01 -05:00
John Bintz
4727ad5b7b show an indicator when wait tests are running, so it doesn't look like the program crashed 2011-11-21 11:33:51 -05:00
John Bintz
9b5729b808 yet more changes, getting really close 2011-11-21 10:55:37 -05:00
John Bintz
fde8bc3b7b a ton of changes 2011-11-21 10:32:49 -05:00
Leo Lännenmäki
115e2eff8b Clone elements before appending them to the temporary div that is used for logging. 2011-11-21 08:18:16 +02:00
John Bintz
d214674620 fixing things up and cleaning more things 2011-11-20 13:35:30 -05:00
John Bintz
ca8c655f00 more sprockets improvements 2011-11-20 11:56:25 -05:00
John Bintz
61c8ed8828 more sprockets improvements 2011-11-19 19:15:38 -05:00
John Bintz
e04d692d26 reowrk a bunch of the tilt stuff, only use extensions we know 2011-11-19 12:45:40 -05:00
John Bintz
8867d00ac8 support sprockets-style jst templates 2011-11-18 16:00:24 -05:00
John Bintz
537b2e437d more work on making sprockets support better, oh yeah 2011-11-18 11:50:48 -05:00
Leo Lännenmäki
f57a59d767 console.log to clone jQuery objects before appending them.
If the appended element was a child of another element it was removed from that element.
This caused console.logging a child element to remove it from the parent.
2011-11-18 15:09:36 +02:00
John Bintz
4f8e732fa4 run the spec file analyzer through the gauntlet 2011-11-18 06:29:36 -05:00
John Bintz
a2e3ea90c9 require works, whoa 2011-11-17 22:16:04 -05:00
John Bintz
1583807c14 still reworking things, broken 2011-11-17 16:18:25 -05:00
John Bintz
9b103807ee explicitly include coffeescript, might fix #79 2011-11-16 15:39:45 -05:00
John Bintz
4150dd1828 working on stuff, broken 2011-11-16 15:28:02 -05:00
John Bintz
91d9773933 do the ping better 2011-11-10 14:18:25 -05:00
John Bintz
26762f0586 have the built-in reporter ping the runner when tests complete, to keep it alive 2011-11-10 13:52:42 -05:00
John Bintz
c7ce823409 merge in the new file handle approach, try it and let me know where it breaks 2011-11-10 11:32:54 -05:00
John Bintz
495fd1900e nuke the cpu detection 2011-11-10 11:18:55 -05:00
John Bintz
2d73baabb3 bump version 2011-11-06 09:32:09 -05:00
John Bintz
ce7b0f1368 remove cpu detection, who cares when the runner's about to be totally slimmed down 2011-11-06 09:26:37 -05:00
John Bintz
5ca065728d finalize the runner, time to merge? 2011-11-05 14:19:41 -04:00
John Bintz
3a559fb0d5 more cleaning 2011-10-26 22:20:51 -04:00
John Bintz
7b91fc5a76 more furniture rearranging 2011-10-26 20:05:05 -04:00
John Bintz
befd0b4a2d streamline more things 2011-10-26 08:55:44 -04:00
John Bintz
69d865c050 rearrange the furniture some more 2011-10-26 08:45:23 -04:00
John Bintz
298e8c2d3d last set of changes 2011-10-25 22:22:29 -04:00
John Bintz
d9ade573c9 clean out the old cruft, getting really close 2011-10-25 16:15:52 -04:00
John Bintz
9289f97f16 more gutting and cleaning, just like a fish 2011-10-25 15:41:22 -04:00
John Bintz
7db116fb45 more breakage 2011-10-25 11:25:28 -04:00
John Bintz
54e5d5c9d5 more breakage 2011-10-25 11:25:02 -04:00
John Bintz
dda84fdcb9 first big switch to javascript doing all the work 2011-10-24 16:40:08 -04:00
John Bintz
894b979674 merge jasmine.yml keys the same way as the gem 2011-10-24 11:48:41 -04:00
John Bintz
cba18bfd22 bump version 2011-10-24 11:22:50 -04:00
John Bintz
7b3e9eaa3d changelog 2011-10-24 11:03:06 -04:00
John Bintz
eede055dfe console.peek seems like a good idea, let's try it 2011-10-17 19:47:42 -04:00