Permalink
Browse files

Merge branch 'feature/testing' into develop

  • Loading branch information...
2 parents 1820cc2 + 0bda586 commit fedc20174f2e6735109472473fa62d6f6b9070a8 @brownman committed Oct 31, 2012
Showing with 4,704 additions and 160 deletions.
  1. +21 −0 .livereload
  2. +13 −3 Gemfile
  3. +73 −7 Gemfile.lock
  4. +10 −1 Gemfile~
  5. +22 −0 Guardfile
  6. +22 −0 Guardfile~
  7. +0 −5 app/assets/javascripts/application.js
  8. +3 −6 app/assets/javascripts/application.js~
  9. +7 −3 app/assets/javascripts/backbone/templates/comments/comment.jst.ejs
  10. +12 −4 app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~
  11. +1 −1 app/assets/javascripts/backbone/templates/comments/new.jst.ejs
  12. +1 −1 app/assets/javascripts/backbone/templates/comments/new.jst.ejs~
  13. +45 −15 app/assets/javascripts/backbone/views/comments/comment_view.js.coffee
  14. +42 −16 app/assets/javascripts/backbone/views/comments/comment_view.js.coffee~
  15. +2 −0 app/assets/stylesheets/application.css
  16. +15 −0 app/assets/stylesheets/application.css~
  17. +2 −3 app/assets/stylesheets/bootstrap_and_overrides.css.less
  18. +3 −95 app/assets/stylesheets/bootstrap_and_overrides.css.less~
  19. +8 −0 lib/tasks/jasmine.rake
  20. +22 −0 public/javascripts/Player.js
  21. +7 −0 public/javascripts/Song.js
  22. +1 −0 spec/javascripts/PlayerSpec.js
  23. +58 −0 spec/javascripts/PlayerSpec.js~
  24. +76 −0 spec/javascripts/collections/tasks_spec.js
  25. +75 −0 spec/javascripts/collections/tasks_spec.js~
  26. +2 −0 spec/javascripts/fixtures/baz.html.haml
  27. +6 −0 spec/javascripts/fixtures/form-fixture.html
  28. +12 −0 spec/javascripts/foo_spec.js.coffee
  29. +14 −0 spec/javascripts/foo_spec.js.coffee~
  30. +9 −0 spec/javascripts/helpers/SpecHelper.js
  31. +110 −0 spec/javascripts/models/task_spec.js
  32. +110 −0 spec/javascripts/models/task_spec.js~
  33. +5 −0 spec/javascripts/sample_spec.js
  34. +5 −0 spec/javascripts/sample_spec.js~
  35. +3 −0 spec/javascripts/spec.css
  36. +29 −0 spec/javascripts/spec.js
  37. 0 spec/javascripts/spec.js.coffee
  38. 0 spec/javascripts/spec.js.coffee~
  39. +29 −0 spec/javascripts/spec.js~
  40. +1 −0 spec/javascripts/support/jasmine.yml
  41. +81 −0 spec/javascripts/support/jasmine.yml~
  42. BIN spec/javascripts/support/phantomjs
  43. +21 −0 spec/javascripts/support/request_matchers.js
  44. +130 −0 spec/javascripts/views/form_spec.js
  45. +57 −0 spec/javascripts/views/list_spec.js
  46. +27 −0 spec/javascripts/views/task_spec.js
  47. +43 −0 vendor/assets/javascripts/jasmine-sinon.js
  48. +3,469 −0 vendor/assets/javascripts/sinon.js
View
@@ -0,0 +1,21 @@
+# Lines starting with pound sign (#) are ignored.
+
+# additional extensions to monitor
+#config.exts << 'haml'
+
+# exclude files with NAMES matching this mask
+#config.exclusions << '~*'
+# exclude files with PATHS matching this mask (if the mask contains a slash)
+#config.exclusions << '/excluded_dir/*'
+# exclude files with PATHS matching this REGEXP
+#config.exclusions << /somedir.*(ab){2,4}.(css|js)$/
+
+# reload the whole page when .js changes
+#config.apply_js_live = false
+# reload the whole page when .css changes
+#config.apply_css_live = false
+# reload the whole page when images (png, jpg, gif) change
+#config.apply_images_live = false
+
+# wait 100ms for more changes before reloading a page
+#config.grace_period = 0.1
View
@@ -5,9 +5,6 @@ gem 'rails', '3.2.2'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-group :development, :test do
- gem 'sqlite3'
-end
group :production do
gem 'pg'
@@ -23,6 +20,7 @@ group :assets do
# gem 'therubyracer'
gem 'uglifier', '>= 1.0.3'
+
end
gem 'jquery-rails'
@@ -46,3 +44,15 @@ gem 'twitter-bootstrap-rails'
gem 'rails-backbone', '0.7.0'
gem 'thin'
+
+group :development, :test do
+ gem 'jasmine'
+ gem 'jasminerice'
+ gem 'guard'
+ gem 'guard-jasmine'
+ gem 'guard-coffeescript'
+ gem 'guard-livereload'
+ gem 'sqlite3'
+end
+
+
View
@@ -28,43 +28,88 @@ GEM
activesupport (3.2.2)
i18n (~> 0.6)
multi_json (~> 1.0)
+ addressable (2.3.2)
arel (3.0.2)
- builder (3.0.3)
+ builder (3.0.4)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
commonjs (0.2.6)
daemons (1.1.9)
+ diff-lcs (1.1.3)
ejs (1.0.0)
+ em-websocket (0.3.6)
+ addressable (>= 2.1.1)
+ eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
+ ffi (1.1.5)
+ guard (1.5.2)
+ listen (>= 0.4.2)
+ lumberjack (>= 1.0.2)
+ pry (>= 0.9.10)
+ thor (>= 0.14.6)
+ guard-coffeescript (0.5.4)
+ coffee-script (>= 2.2.0)
+ guard (>= 0.8.3)
+ guard-jasmine (1.9.3)
+ childprocess
+ guard (>= 1.1.0)
+ multi_json
+ thor
+ guard-livereload (0.4.2)
+ em-websocket (>= 0.2.0)
+ guard (>= 0.10.0)
+ multi_json (~> 1.0)
+ haml (3.1.7)
hike (1.2.1)
i18n (0.6.1)
+ jasmine (1.2.1)
+ jasmine-core (>= 1.2.0)
+ rack (~> 1.0)
+ rspec (>= 1.3.1)
+ selenium-webdriver (>= 0.1.3)
+ jasmine-core (1.2.0)
+ jasminerice (0.0.10)
+ coffee-rails
+ haml
journey (1.0.4)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
less (2.2.2)
commonjs (~> 0.2.6)
- less-rails (2.2.3)
+ less-rails (2.2.5)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.3.10.4)
+ libwebsocket (0.1.5)
+ addressable
+ listen (0.5.3)
+ lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ method_source (0.8.1)
mime-types (1.19)
multi_json (1.3.6)
pg (0.14.1)
polyglot (0.3.3)
+ pry (0.9.10)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.3.1)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -94,11 +139,26 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.3)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.11.3)
+ rubyzip (0.9.9)
sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
+ selenium-webdriver (2.25.0)
+ childprocess (>= 0.2.5)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
+ rubyzip
+ slop (3.3.3)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -112,15 +172,15 @@ GEM
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
- treetop (1.4.11)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.1.3)
+ twitter-bootstrap-rails (2.1.4)
actionpack (>= 3.1)
less-rails (~> 2.2.3)
railties (>= 3.1)
- therubyracer (~> 0.10.2)
- tzinfo (0.3.33)
+ therubyracer (>= 0.10.2)
+ tzinfo (0.3.34)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -130,6 +190,12 @@ PLATFORMS
DEPENDENCIES
coffee-rails (~> 3.2.1)
+ guard
+ guard-coffeescript
+ guard-jasmine
+ guard-livereload
+ jasmine
+ jasminerice
jquery-rails
pg
rails (= 3.2.2)
View
@@ -1,14 +1,22 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.1'
+gem 'rails', '3.2.2'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
group :development, :test do
+ gem 'jasmine'
+ gem 'jasminerice'
+ gem 'guard'
+ gem 'guard-jasmine'
+ gem 'guard-coffeescript'
+ gem 'guard-livereload'
gem 'sqlite3'
end
+
+
group :production do
gem 'pg'
end
@@ -23,6 +31,7 @@ group :assets do
# gem 'therubyracer'
gem 'uglifier', '>= 1.0.3'
+
end
gem 'jquery-rails'
View
@@ -0,0 +1,22 @@
+
+
+guard 'livereload' do
+ watch(%r{app/views/.+\.(erb|haml|slim)})
+ watch(%r{app/helpers/.+\.rb})
+ watch(%r{public/.+\.(css|js|html)})
+ watch(%r{config/locales/.+\.yml})
+ # Rails Assets Pipeline
+ watch(%r{(app|vendor)/assets/\w+/(.+\.(css|js|html)).*}) { |m| "/assets/#{m[2]}" }
+end
+
+guard :jasmine do
+ watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$}) { 'spec/javascripts' }
+ watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+ watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{ m[1] }_spec.#{ m[2] }" }
+end
+
+guard :jasmine do
+ watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$}) { 'spec/javascripts' }
+ watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+ watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{ m[1] }_spec.#{ m[2] }" }
+end
View
@@ -0,0 +1,22 @@
+
+
+guard 'livereload' do
+ watch(%r{app/views/.+\.(erb|haml|slim)})
+ watch(%r{app/helpers/.+\.rb})
+ watch(%r{public/.+\.(css|js|html)})
+ watch(%r{config/locales/.+\.yml})
+ # Rails Assets Pipeline
+ watch(%r{(app|vendor)/assets/\w+/(.+\.(css|js|html)).*}) { |m| "/assets/#{m[2]}" }
+end
+
+guard :jasmine do
+ watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$}) { 'spec/javascripts' }
+ watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+ watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{ m[1] }_spec.#{ m[2] }" }
+end
+
+guard :jasmine do
+ watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$}) { 'spec/javascripts' }
+ watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
+ watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{ m[1] }_spec.#{ m[2] }" }
+end
@@ -20,9 +20,4 @@
//= require backbone_datalink
//= require backbone-localstorage
//= require backbone/rails_backbone_relational
-//= require underscore
-//= require backbone
-//= require backbone_rails_sync
-//= require backbone_datalink
-//= require backbone/rails_backbone_relational
//= require_tree .
@@ -1,4 +1,4 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
+/// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
@@ -12,16 +12,13 @@
//
//= require jquery
//= require jquery_ujs
+//= require twitter/bootstrap
//= require underscore
//= require backbone
//= require backbone-relational
//= require backbone_rails_sync
//= require backbone_datalink
//= require backbone-localstorage
//= require backbone/rails_backbone_relational
-//= require underscore
-//= require backbone
-//= require backbone_rails_sync
-//= require backbone_datalink
-//= require backbone/rails_backbone_relational
//= require_tree .
+alert('app')
@@ -4,11 +4,12 @@
+<input class='span6' height='1em' type='text' value='<%= obj.title %>'></input>
+
+
+<input height='1em' class='span3' name="content" value='<%= obj.content %>' />
-<input height='1em' name="content" value='<%= obj.content %>' />
-<textarea rows="2" cols="20" class='content' name="content" value='<%= obj.content %>' />
-<input height='1em' type='text' value='<%= obj.title %>'></input>
@@ -17,6 +18,9 @@
+
+<input class="btn save" type="button" value="<%= obj2 %>">
+
<div class="btn-group todo-array " <%= obj.direction ? 'dir="rtl"' : '' %> >
<%= listed2 %>
@@ -4,20 +4,28 @@
+<input class='span6' height='1em' type='text' value='<%= obj.title %>'></input>
+
+
+<input height='1em' class='span3' name="content" value='<%= obj.content %>' />
-<input height='1em' name="content" value='<%= obj.content %>' />
-<textarea rows="2" cols="20" class='content' name="content" value='<%= obj.content %>' />
-<input height='1em' type='text' value='<%= obj.title %>'></input>
<input rows="1" type="checkbox" name="direction" class="direction" <%= obj.direction ? 'checked="checked"' : '' %> />
+<input width='0px' class="btn save" type="button" value="<%= obj2 %>" />
+
+<button width='0px' class="btn save" type="submit">
+<%= obj2 %>
+</button>
+
+<input class="btn save" type="button" value="<%= obj2 %>">
-<div class="btn-group todo-array " <%= obj.direction ? 'direction="rtl"' : '' %> >
+<div class="btn-group todo-array " <%= obj.direction ? 'dir="rtl"' : '' %> >
<%= listed2 %>
</div>
@@ -1,4 +1,4 @@
-<div class="form span3">
+<div class="new_comment form span3">
<form class="field1" height='1em' >
@@ -1,4 +1,4 @@
-<div class="span3">
+<div class="new-comment form span3">
<form class="field1" height='1em' >
Oops, something went wrong.

0 comments on commit fedc201

Please sign in to comment.