Skip to content

Commit c312ab4

Browse files
committed
Update gem dependencies to latest versions
1 parent 40cbb56 commit c312ab4

File tree

7 files changed

+23
-16
lines changed

7 files changed

+23
-16
lines changed

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ end
3636
group :test do
3737
gem 'faker'
3838
gem 'capybara'
39+
gem 'shoulda-matchers'
3940
gem 'guard-rspec', '= 4.2.0'
4041
gem 'rb-inotify', '~> 0.9'
4142
gem 'launchy'

Gemfile.lock

+9-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PATH
2222
rmagick (>= 2.13.4)
2323
sanitize (>= 4.4.0)
2424
sass-rails (>= 4.0.0)
25-
sitemap_generator (~> 5.0.0, >= 5.0.5)
25+
sitemap_generator (>= 5.0.5)
2626
sprockets-rails (< 4)
2727
thor (>= 0.19)
2828
thread_safe (>= 0.3)
@@ -82,7 +82,7 @@ GEM
8282
autoprefixer-rails (9.7.3)
8383
execjs
8484
bcrypt (3.1.13)
85-
builder (3.2.3)
85+
builder (3.2.4)
8686
capistrano (3.11.2)
8787
airbrussh (>= 1.0.0)
8888
i18n
@@ -121,7 +121,7 @@ GEM
121121
factory_girl_rails (4.9.0)
122122
factory_girl (~> 4.9.0)
123123
railties (>= 3.0.0)
124-
faker (2.8.0)
124+
faker (2.8.1)
125125
i18n (>= 1.6, < 1.8)
126126
ffi (1.11.3)
127127
formatador (0.2.5)
@@ -170,7 +170,7 @@ GEM
170170
kaminari-core (1.1.1)
171171
launchy (2.4.3)
172172
addressable (~> 2.3)
173-
listen (3.2.0)
173+
listen (3.2.1)
174174
rb-fsevent (~> 0.10, >= 0.10.3)
175175
rb-inotify (~> 0.9, >= 0.9.10)
176176
loofah (2.4.0)
@@ -280,8 +280,10 @@ GEM
280280
sprockets-rails
281281
tilt
282282
shellany (0.0.1)
283-
sitemap_generator (5.0.5)
284-
builder
283+
shoulda-matchers (4.1.2)
284+
activesupport (>= 4.2.0)
285+
sitemap_generator (6.0.2)
286+
builder (~> 3.0)
285287
sprockets (4.0.0)
286288
concurrent-ruby (~> 1.0)
287289
rack (> 1, < 3)
@@ -323,6 +325,7 @@ DEPENDENCIES
323325
rb-inotify (~> 0.9)
324326
rspec (~> 2.14.1, < 3)
325327
rspec-rails (~> 2.14.0)
328+
shoulda-matchers
326329
thor
327330
yard
328331

app/controllers/lines/application_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Lines
22
class ApplicationController < ActionController::Base
3-
3+
44
private
55

66
# sets the current_lines_user if one exists in session

lines.gemspec

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
$:.push File.expand_path("../lib", __FILE__)
22

3-
# Maintain your gem's version:
43
require "lines/version"
54
require 'date'
65

7-
# Describe your gem and declare its dependencies:
86
Gem::Specification.new do |s|
97
s.name = "lines-engine"
108
s.version = Lines::VERSION
11-
s.authors = ["Opoloo GbR"]
9+
s.authors = ["Jochen Greif"]
1210
s.email = ["[email protected]"]
1311
s.homepage = "http://lines.opoloo.com"
1412
s.summary = "LINES is the open source blog platform you have been waiting for"
@@ -32,7 +30,7 @@ Gem::Specification.new do |s|
3230
s.add_runtime_dependency 'jquery-rails', '< 6', '>= 3.1.0'
3331
s.add_runtime_dependency 'acts-as-taggable-on', '>= 3.5'
3432
s.add_runtime_dependency 'bcrypt', '~> 3.1.0', '>= 3.1.0'
35-
s.add_runtime_dependency 'sitemap_generator', '~> 5.0.0', '>= 5.0.5'
33+
s.add_runtime_dependency 'sitemap_generator', '>= 5.0.5'
3634
s.add_runtime_dependency 'jquery-fileupload-rails', '>= 0.4.1'
3735
s.add_runtime_dependency 'jquery-ui-rails', '>= 5.0.0'
3836
s.add_runtime_dependency 'sanitize', '>= 4.4.0'
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//= link_directory ../javascripts .js
2+
//= link_directory ../stylesheets .css
3+
//= link_tree ../fonts
4+
//= link_tree ../heroes
5+
//= link_tree ../images

spec/dummy/config/environments/test.rb

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
# Show full error reports and disable caching.
2323
config.consider_all_requests_local = true
2424
config.action_controller.perform_caching = false
25-
config.active_record.raise_in_transactional_callbacks = true
2625

2726
# Raise exceptions instead of rendering exception templates.
2827
config.action_dispatch.show_exceptions = false

spec/spec_helper.rb

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# This file is copied to spec/ when you run 'rails generate rspec:install'
22
ENV["RAILS_ENV"] ||= 'test'
33
require File.expand_path("../dummy/config/environment", __FILE__)
4-
require 'rspec/rails'
4+
#require 'rspec/rails'
55
require 'rspec/autorun'
6-
require 'capybara/rspec'
6+
#require 'capybara/rspec'
7+
require 'capybara/rails'
78
require 'factory_girl_rails'
89

910

@@ -29,12 +30,12 @@
2930
# If you're not using ActiveRecord, or you'd prefer not to run each of your
3031
# examples within a transaction, remove the following line or assign false
3132
# instead of true.
32-
config.use_transactional_fixtures = true
33+
#config.use_transactional_fixtures = true
3334

3435
# If true, the base class of anonymous controllers will be inferred
3536
# automatically. This will be the default behavior in future versions of
3637
# rspec-rails.
37-
config.infer_base_class_for_anonymous_controllers = false
38+
#config.infer_base_class_for_anonymous_controllers = false
3839

3940
# Run specs in random order to surface order dependencies. If you find an
4041
# order dependency and want to debug it, you can fix the order by providing

0 commit comments

Comments
 (0)