Merge pull request #418 from refinery/rails-4-2

Rails 4.2

3 files changed, 9 insertions, 9 deletions

diff --git a/Gemfile b/Gemfile
index c049859..935dda4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,17 +2,18 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', github: 'refinery/refinerycms'
-gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n'
-gem 'refinerycms-acts-as-indexed', github: 'refinery/refinerycms-acts-as-indexed'
-gem 'filters_spam', github: 'resolve/filters_spam'
+git "https://github.com/refinery/refinerycms", branch: "master" do
+  gem 'refinerycms'
 
-gem 'mime-types', '1.25.1'
+  group :development, :test do
+    gem 'refinerycms-testing'
+  end
+end
 
 group :test do
-  gem 'refinerycms-testing', github: 'refinery/refinerycms'
   gem 'pry'
   gem 'launchy'
+  gem 'selenium-webdriver'
 end
 
 # Database Configuration
diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec
index 2d99591..75acccb 100644
--- a/refinerycms-blog.gemspec
+++ b/refinerycms-blog.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency    'acts-as-taggable-on'
   s.add_dependency    'seo_meta',              '~> 2.0.0.rc.1'
   s.add_dependency    'rails_autolink',        '~> 1.1.3'
-  s.add_dependency    'friendly_id',           '~> 5.0.0'
-  s.add_dependency    'globalize',             '~> 4.0.0'
+  s.add_dependency    'friendly_id',           '~> 5.1.0'
+  s.add_dependency    'globalize',             ['>= 4.0.0', '< 5.2']
   s.add_dependency    'jquery-ui-rails',       '~> 5.0.0'
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3875b33..a9557c4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,6 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 
 require 'rspec/rails'
 require 'capybara/rspec'
-require 'factory_girl_rails'
 
 Rails.backtrace_cleaner.remove_silencers!