diff --git a/Gemfile b/Gemfile index 719e700e..de6fc978 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails' +gem 'rails' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -20,6 +20,7 @@ gem "aasm" gem "htmlentities" gem "swf_fu" gem "rails_autolink" +gem "therubyracer" # Gems used only for assets and not required # in production environments by default. @@ -72,7 +73,6 @@ group :test do gem "database_cleaner" gem "cucumber-rails" gem "aruba" - gem "therubyracer" # uncomment to use the webkit option. This depends on Qt to be installed #gem "capybara-webkit" diff --git a/Gemfile.lock b/Gemfile.lock index b3bf4c46..1c036aa4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.0.7) + aasm (3.0.8) actionmailer (3.2.6) actionpack (= 3.2.6) mail (~> 2.4.4) @@ -48,7 +48,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.2) + childprocess (0.3.3) ffi (~> 1.0.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -72,10 +72,10 @@ GEM erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (3.4.0) + factory_girl (3.5.0) activesupport (>= 3.0.0) - factory_girl_rails (3.4.0) - factory_girl (~> 3.4.0) + factory_girl_rails (3.5.0) + factory_girl (~> 3.5.0) railties (>= 3.0.0) ffi (1.0.11) formatize (1.1.0) @@ -83,7 +83,7 @@ GEM actionpack (~> 3.0) bluecloth (~> 2.2) gem_plugin (0.2.3) - gherkin (2.11.0) + gherkin (2.11.1) json (>= 1.4.6) hike (1.2.1) htmlentities (4.3.1) @@ -100,13 +100,13 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) + mime-types (1.19) mongrel (1.2.0.pre2) daemons (~> 1.0.10) gem_plugin (~> 0.2.3) multi_json (1.3.6) mysql2 (0.3.11) - nokogiri (1.5.4) + nokogiri (1.5.5) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -143,7 +143,7 @@ GEM rspec-expectations (2.10.0) diff-lcs (~> 1.1.3) rspec-mocks (2.10.1) - rubyzip (0.9.8) + rubyzip (0.9.9) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) sass (3.1.19) @@ -151,9 +151,8 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.22.2) + selenium-webdriver (2.24.0) childprocess (>= 0.2.5) - ffi (~> 1.0) libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip @@ -167,15 +166,15 @@ GEM rails (>= 3.1) therubyracer (0.10.1) libv8 (~> 3.3.10) - thor (0.15.2) + thor (0.15.3) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.2.4) + uglifier (1.2.5) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.3) will_paginate (3.0.3) xpath (0.1.4) nokogiri (~> 1.3) diff --git a/test/functional/message_gateway_test.rb b/test/functional/message_gateway_test.rb index 3c347d79..693448e8 100644 --- a/test/functional/message_gateway_test.rb +++ b/test/functional/message_gateway_test.rb @@ -25,13 +25,6 @@ class MessageGatewayTest < ActiveSupport::TestCase assert_equal(@user, message_todo.user) end - def test_double_sms - todo_count = Todo.count - load_message('sample_sms.txt') - load_message('sample_sms.txt') - assert_equal(todo_count+1, Todo.count) - end - def test_mms_with_subject todo_count = Todo.count