nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update jasmine and move it to the test/development group

Browse source 
move jasmine to development and test env, update it
This commit is contained in:
Maxwell Salzberg 2012-04-10 19:28:45 -07:00
parent 1ea2473986
commit 37c3c3a860
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Gemfile
View file

@ -134,12 +134,11 @@ gem 'em-synchrony', '1.0.0', :platforms => :ruby_19
# jazzy jasmine
# Use the latest Jasmine from github for asset pipeline compatibility
gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git'
### GROUPS ####
group :test do
gem 'capybara', '~> 1.1.2'
gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.7.1'
@ -167,6 +166,11 @@ group :test do
gem 'guard-cucumber'
end
group :test, :development do
# Use the latest Jasmine from github for asset pipeline compatibility
gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git'
end
group :development do
gem 'heroku'
gem 'heroku_san'

12
Gemfile.lock
View file

@ -36,11 +36,11 @@ GIT
GIT
remote: git://github.com/pivotal/jasmine-gem.git
revision: 34c1529c3f7b78ebd81ac16006f141fc6b7cf013
revision: c72e8d248d49a1ebe53f31a09ac511194ad4edf1
specs:
jasmine (1.2.0.rc2)
jasmine-core (>= 1.2.0.rc1)
rack (>= 1.1)
jasmine (1.2.0.rc3)
jasmine-core (>= 1.2.0.rc3)
rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
@ -229,7 +229,7 @@ GEM
actionpack (~> 3.0)
i18n-inflector (~> 2.6)
railties (~> 3.0)
jasmine-core (1.2.0.rc1)
jasmine-core (1.2.0.rc3)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
@ -395,7 +395,7 @@ GEM
ruby-progressbar (0.0.10)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.6.1)
rubyzip (0.9.7)
sass (3.1.15)
sass-rails (3.1.4)
actionpack (~> 3.1.0)