File tree 7 files changed +23
-16
lines changed
7 files changed +23
-16
lines changed Original file line number Diff line number Diff line change 36
36
group :test do
37
37
gem 'faker'
38
38
gem 'capybara'
39
+ gem 'shoulda-matchers'
39
40
gem 'guard-rspec' , '= 4.2.0'
40
41
gem 'rb-inotify' , '~> 0.9'
41
42
gem 'launchy'
Original file line number Diff line number Diff line change 22
22
rmagick (>= 2.13.4 )
23
23
sanitize (>= 4.4.0 )
24
24
sass-rails (>= 4.0.0 )
25
- sitemap_generator (~> 5.0.0 , >= 5.0.5 )
25
+ sitemap_generator (>= 5.0.5 )
26
26
sprockets-rails (< 4 )
27
27
thor (>= 0.19 )
28
28
thread_safe (>= 0.3 )
82
82
autoprefixer-rails (9.7.3 )
83
83
execjs
84
84
bcrypt (3.1.13 )
85
- builder (3.2.3 )
85
+ builder (3.2.4 )
86
86
capistrano (3.11.2 )
87
87
airbrussh (>= 1.0.0 )
88
88
i18n
121
121
factory_girl_rails (4.9.0 )
122
122
factory_girl (~> 4.9.0 )
123
123
railties (>= 3.0.0 )
124
- faker (2.8.0 )
124
+ faker (2.8.1 )
125
125
i18n (>= 1.6 , < 1.8 )
126
126
ffi (1.11.3 )
127
127
formatador (0.2.5 )
170
170
kaminari-core (1.1.1 )
171
171
launchy (2.4.3 )
172
172
addressable (~> 2.3 )
173
- listen (3.2.0 )
173
+ listen (3.2.1 )
174
174
rb-fsevent (~> 0.10 , >= 0.10.3 )
175
175
rb-inotify (~> 0.9 , >= 0.9.10 )
176
176
loofah (2.4.0 )
280
280
sprockets-rails
281
281
tilt
282
282
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 )
285
287
sprockets (4.0.0 )
286
288
concurrent-ruby (~> 1.0 )
287
289
rack (> 1 , < 3 )
@@ -323,6 +325,7 @@ DEPENDENCIES
323
325
rb-inotify (~> 0.9 )
324
326
rspec (~> 2.14.1 , < 3 )
325
327
rspec-rails (~> 2.14.0 )
328
+ shoulda-matchers
326
329
thor
327
330
yard
328
331
Original file line number Diff line number Diff line change 1
1
module Lines
2
2
class ApplicationController < ActionController ::Base
3
-
3
+
4
4
private
5
5
6
6
# sets the current_lines_user if one exists in session
Original file line number Diff line number Diff line change 1
1
$:. push File . expand_path ( "../lib" , __FILE__ )
2
2
3
- # Maintain your gem's version:
4
3
require "lines/version"
5
4
require 'date'
6
5
7
- # Describe your gem and declare its dependencies:
8
6
Gem ::Specification . new do |s |
9
7
s . name = "lines-engine"
10
8
s . version = Lines ::VERSION
11
- s . authors = [ "Opoloo GbR " ]
9
+ s . authors = [ "Jochen Greif " ]
12
10
13
11
s . homepage = "http://lines.opoloo.com"
14
12
s . summary = "LINES is the open source blog platform you have been waiting for"
@@ -32,7 +30,7 @@ Gem::Specification.new do |s|
32
30
s . add_runtime_dependency 'jquery-rails' , '< 6' , '>= 3.1.0'
33
31
s . add_runtime_dependency 'acts-as-taggable-on' , '>= 3.5'
34
32
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'
36
34
s . add_runtime_dependency 'jquery-fileupload-rails' , '>= 0.4.1'
37
35
s . add_runtime_dependency 'jquery-ui-rails' , '>= 5.0.0'
38
36
s . add_runtime_dependency 'sanitize' , '>= 4.4.0'
Original file line number Diff line number Diff line change
1
+ //= link_directory ../javascripts .js
2
+ //= link_directory ../stylesheets .css
3
+ //= link_tree ../fonts
4
+ //= link_tree ../heroes
5
+ //= link_tree ../images
Original file line number Diff line number Diff line change 22
22
# Show full error reports and disable caching.
23
23
config . consider_all_requests_local = true
24
24
config . action_controller . perform_caching = false
25
- config . active_record . raise_in_transactional_callbacks = true
26
25
27
26
# Raise exceptions instead of rendering exception templates.
28
27
config . action_dispatch . show_exceptions = false
Original file line number Diff line number Diff line change 1
1
# This file is copied to spec/ when you run 'rails generate rspec:install'
2
2
ENV [ "RAILS_ENV" ] ||= 'test'
3
3
require File . expand_path ( "../dummy/config/environment" , __FILE__ )
4
- require 'rspec/rails'
4
+ # require 'rspec/rails'
5
5
require 'rspec/autorun'
6
- require 'capybara/rspec'
6
+ #require 'capybara/rspec'
7
+ require 'capybara/rails'
7
8
require 'factory_girl_rails'
8
9
9
10
29
30
# If you're not using ActiveRecord, or you'd prefer not to run each of your
30
31
# examples within a transaction, remove the following line or assign false
31
32
# instead of true.
32
- config . use_transactional_fixtures = true
33
+ # config.use_transactional_fixtures = true
33
34
34
35
# If true, the base class of anonymous controllers will be inferred
35
36
# automatically. This will be the default behavior in future versions of
36
37
# rspec-rails.
37
- config . infer_base_class_for_anonymous_controllers = false
38
+ # config.infer_base_class_for_anonymous_controllers = false
38
39
39
40
# Run specs in random order to surface order dependencies. If you find an
40
41
# order dependency and want to debug it, you can fix the order by providing
You can’t perform that action at this time.
0 commit comments