From 37c3c3a860599312d10fdd67374ed5dba6b66445 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 10 Apr 2012 19:28:45 -0700
Subject: [PATCH] update jasmine and move it to the test/development group
move jasmine to development and test env, update it
---
Gemfile | 10 +++++++---
Gemfile.lock | 12 ++++++------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index 1a82058dd8..a7981c44e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 849998497d..a126e84469 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
--
GitLab