Remove useless ActiveSupport
Joel AZEMAR
committed Apr 14, 2014
commit 6e52cf6ca51068909716d0e2914987035f7fe57c
Showing 9
changed files with
7 additions
and 37 deletions
Gemfile.lock
+0
-1
| @@ | @@ -2,7 +2,6 @@ PATH |
| remote: . | |
| specs: | |
| locomotivecms_steam (0.1.0) | |
| - | activesupport (~> 3.2) |
| dragonfly (~> 1.0.3) | |
| locomotivecms-solid | |
| locomotivecms_common (~> 0.0.1) | |
locomotive/steam/initializers.rb b/lib/locomotive/steam/initializers.rb
+1
-1
| @@ | @@ -3,5 +3,5 @@ require_relative 'initializers/i18n.rb' |
| require_relative 'initializers/dragonfly.rb' | |
| Locomotive::Common.configure do |config| | |
| - | config.notifier = Locomotive::Common::Logger.setup(File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'log', 'locomotivecms.log')) |
| + | config.notifier = Locomotive::Common::Logger.setup |
| end | |
locomotivecms_steam.gemspec
+0
-1
| @@ | @@ -30,7 +30,6 @@ Gem::Specification.new do |spec| |
| spec.add_dependency 'sprockets', '~> 2.0' | |
| spec.add_dependency 'sprockets-sass', '~> 1.0' | |
| spec.add_dependency 'dragonfly', '~> 1.0.3' | |
| - | spec.add_dependency 'activesupport', '~> 3.2' # TODO: upgrade to 4.x |
| spec.add_dependency 'will_paginate', '~> 3.0' # TODO: move to kaminari | |
| spec.add_dependency 'redcarpet', '~> 3.1' | |
spec/integration/integration_helper.rb
+2
-13
| @@ | @@ -1,15 +1,4 @@ |
| - | # encoding: utf-8 |
| + | require_relative '../../lib/locomotive/steam/server' |
| require File.dirname(__FILE__) + '/../spec_helper' | |
| - | # require 'vcr' |
| - | # require 'webmock/rspec' |
| - | require 'active_support/core_ext' |
| - | |
| - | # VCR.configure do |c| |
| - | # c.ignore_localhost = false |
| - | # c.cassette_library_dir = File.dirname(__FILE__) + '/cassettes' |
| - | # c.hook_into :webmock |
| - | # c.default_cassette_options = { record: :new_episodes } |
| - | # c.configure_rspec_metadata! |
| - | # c.allow_http_connections_when_no_cassette = false |
| - | # end |
| \ No newline at end of file | |
| + | require 'rack/test' |
spec/integration/server/basic_spec.rb
+0
-4
| @@ | @@ -1,8 +1,4 @@ |
| - | # encoding: utf-8 |
| - | |
| require File.dirname(__FILE__) + '/../integration_helper' | |
| - | require 'locomotive/steam/server' |
| - | require 'rack/test' |
| describe Locomotive::Steam::Server do | |
spec/integration/server/contact_form_spec.rb
+0
-4
| @@ | @@ -1,8 +1,4 @@ |
| - | # encoding: utf-8 |
| - | |
| require File.dirname(__FILE__) + '/../integration_helper' | |
| - | require 'locomotive/steam/server' |
| - | require 'rack/test' |
| describe 'ContactForm' do | |
spec/integration/server/liquid_spec.rb
+0
-4
| @@ | @@ -1,8 +1,4 @@ |
| - | # encoding: utf-8 |
| - | |
| require File.dirname(__FILE__) + '/../integration_helper' | |
| - | require 'locomotive/steam/server' |
| - | require 'rack/test' |
| describe Locomotive::Steam::Server do | |
spec/integration/server/with_scope_spec.rb
+0
-4
| @@ | @@ -1,8 +1,4 @@ |
| - | # encoding: utf-8 |
| - | |
| require File.dirname(__FILE__) + '/../integration_helper' | |
| - | require 'locomotive/steam/server' |
| - | require 'rack/test' |
| describe 'Complex with_scope conditions' do | |
spec/support/helpers.rb
+4
-5
| @@ | @@ -1,4 +1,5 @@ |
| require 'common' | |
| + | require_relative '../../lib/locomotive/steam/initializers' |
| module Spec | |
| module Helpers | |
| @@ | @@ -12,19 +13,17 @@ module Spec |
| end | |
| def run_server | |
| + | Locomotive::Common.reset |
| Locomotive::Common.configure do |config| | |
| path = File.join(File.expand_path('../../spec/fixtures/default/log/locomotivecms.log')) | |
| config.notifier = Locomotive::Common::Logger.setup(path) | |
| end | |
| + | Locomotive::Common::Logger.info 'Server started...' |
| + | |
| reader = Locomotive::Mounter::Reader::FileSystem.instance | |
| reader.run!(path: 'spec/fixtures/default') | |
| - | # require 'locomotive/steam/initializers' |
| - | require_relative '../../lib/locomotive/steam/initializers/sprockets.rb' |
| - | require_relative '../../lib/locomotive/steam/initializers/i18n.rb' |
| - | require_relative '../../lib/locomotive/steam/initializers/dragonfly.rb' |
| - | |
| Locomotive::Steam::Server.new(reader) | |
| end | |