Skip to content

Commit

Permalink
Install jasmine with jasmine rice.
Browse files Browse the repository at this point in the history
  • Loading branch information
zef committed Jul 7, 2012
1 parent 78086d0 commit 67e4f12
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -26,6 +26,7 @@ gem 'jquery-rails'


group :test, :development do group :test, :development do
gem 'rspec-rails' gem 'rspec-rails'
gem 'jasminerice'
end end


# To use ActiveModel has_secure_password # To use ActiveModel has_secure_password
Expand Down
5 changes: 5 additions & 0 deletions Gemfile.lock
Expand Up @@ -54,8 +54,12 @@ GEM
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
fssm (0.2.9) fssm (0.2.9)
haml (3.1.6)
hike (1.2.1) hike (1.2.1)
i18n (0.6.0) i18n (0.6.0)
jasminerice (0.0.9)
coffee-rails
haml
journey (1.0.4) journey (1.0.4)
jquery-rails (2.0.2) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
Expand Down Expand Up @@ -133,6 +137,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
compass-rails compass-rails
jasminerice
jquery-rails jquery-rails
monarch! monarch!
rails (= 3.2.6) rails (= 3.2.6)
Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/items.js.coffee

This file was deleted.

3 changes: 2 additions & 1 deletion app/assets/stylesheets/lists.sass
Expand Up @@ -10,9 +10,9 @@ body
font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif


.container > header .container > header
+clearfix
+background-image(linear-gradient(white, lighten($light-gray, 11))) +background-image(linear-gradient(white, lighten($light-gray, 11)))
border-bottom: 1px solid $light-gray border-bottom: 1px solid $light-gray
+clearfix
padding: 6px 12px padding: 6px 12px


h1 h1
Expand All @@ -28,6 +28,7 @@ $list-vertical-padding: 4px
$list-horizontal-padding: 10px $list-horizontal-padding: 10px


.lists .lists
+clearfix
margin-left: $list-margin margin-left: $list-margin


.list .list
Expand Down
3 changes: 3 additions & 0 deletions spec/javascripts/lists-view-spec.js.coffee
@@ -0,0 +1,3 @@
describe "Lists View", ->
it 'has a title', ->
expect($('h1')).toHaveText('Lists')
3 changes: 3 additions & 0 deletions spec/javascripts/spec.css
@@ -0,0 +1,3 @@
/*
*= require application
*/
2 changes: 2 additions & 0 deletions spec/javascripts/spec.js.coffee
@@ -0,0 +1,2 @@
#=require application
#=require_tree ./

0 comments on commit 67e4f12

Please sign in to comment.