GitBlixt
teagles/steam

upgrade gems + use Ruby 2.5.0 for the tests + fix the tests + bump version to 1.4.0-rc.1

Didier Lafforgue committed Mar 08, 2018
commit 1b2874878c4d8a8047fd960f2bc391238b8303e3
Showing 6 changed files with 42 additions and 39 deletions
.travis.yml +1 -1
@@ @@ -2,7 +2,7 @@ language: ruby
services: mongodb
before_script: ./script/ci/before_build.sh
rvm:
- - 2.3.3
+ - 2.5.0
env:
- CODECLIMATE_REPO_TOKEN=3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9
addons:
Gemfile +2 -1
@@ @@ -11,6 +11,7 @@ group :development do
# gem 'duktape', path: '/Users/didier/Documents/NoCoffee/ProjectsX/duktape.rb'
# gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
# gem 'thin'
+
gem 'puma'
gem 'haml', '~> 5.0.4'
@@ @@ -36,5 +37,5 @@ group :test do
end
platform :ruby do
- ruby '2.4.3'
+ ruby '2.5.0'
end
Gemfile.lock +28 -28
@@ @@ -1,7 +1,7 @@
PATH
remote: .
specs:
- locomotivecms_steam (1.4.0.pre.alpha)
+ locomotivecms_steam (1.4.0.pre.rc.1)
RedCloth (~> 4.3.2)
autoprefixer-rails (~> 8.0.0)
bcrypt (~> 3.1.11)
@@ @@ -10,20 +10,20 @@ PATH
compass (~> 1.0.3)
dragonfly (~> 1.1.4)
duktape (~> 1.6.1.0)
- httparty (~> 0.15.6)
+ httparty (~> 0.16.0)
kramdown (~> 1.16.2)
locomotivecms-solid (~> 4.0.1)
- locomotivecms_common (~> 0.2.0)
+ locomotivecms_common (~> 0.3.0)
mime-types (~> 3.1.0)
mimetype-fu (~> 0.1.2)
moneta (~> 1.0.0)
morphine (~> 0.1.1)
- nokogiri (~> 1.8.1)
+ nokogiri (~> 1.8.2)
pony (~> 1.12)
rack-cache (~> 1.7.0)
rack-rewrite (~> 1.5.1)
rack_csrf (~> 2.6.0)
- sanitize (~> 4.5.0)
+ sanitize (~> 4.6.0)
sass (~> 3.4.25)
sprockets (~> 3.7.1)
uglifier (~> 4.1.3)
@@ @@ -32,14 +32,14 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
- activesupport (4.2.10)
+ activesupport (5.1.5)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
- attr_extras (4.4.0)
+ attr_extras (5.2.0)
autoprefixer-rails (8.0.0)
execjs
bcrypt (3.1.11)
@@ @@ -86,9 +86,9 @@ GEM
haml (5.0.4)
temple (>= 0.8.0)
tilt
- httparty (0.15.7)
+ httparty (0.16.0)
multi_xml (>= 0.5.2)
- i18n (0.9.1)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
@@ @@ -102,14 +102,14 @@ GEM
locomotivecms-liquid (4.0.0)
locomotivecms-solid (4.0.1)
locomotivecms-liquid (~> 4.0.0)
- locomotivecms_common (0.2.0)
- activesupport (~> 4.2.6)
- attr_extras (~> 4.4.0)
+ locomotivecms_common (0.3.0)
+ activesupport (~> 5.1.5)
+ attr_extras (~> 5.2.0)
colorize
- stringex (~> 2.6.0)
+ stringex (~> 2.8.2)
mail (2.7.0)
mini_mime (>= 0.1.1)
- memory_profiler (0.9.8)
+ memory_profiler (0.9.10)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
@@ @@ -125,25 +125,25 @@ GEM
multi_xml (0.6.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
- nokogumbo (1.4.13)
+ nokogumbo (1.5.0)
nokogiri
origin (2.3.1)
pony (1.12)
mail (>= 2.0)
public_suffix (3.0.2)
- puma (3.11.2)
- rack (2.0.3)
+ puma (3.11.3)
+ rack (2.0.4)
rack-cache (1.7.1)
rack (>= 0.4)
rack-mini-profiler (0.10.7)
rack (>= 1.2.0)
rack-rewrite (1.5.1)
- rack-test (0.8.2)
+ rack-test (0.8.3)
rack (>= 1.0, < 3)
rack_csrf (2.6.0)
rack (>= 1.1.0)
- rake (10.4.2)
- rb-fsevent (0.10.2)
+ rake (12.3.0)
+ rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rspec (3.7.0)
@@ @@ -158,11 +158,11 @@ GEM
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
- rspec-support (3.7.0)
- sanitize (4.5.0)
+ rspec-support (3.7.1)
+ sanitize (4.6.0)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
- nokogumbo (~> 1.4.1)
+ nokogumbo (~> 1.4)
sass (3.4.25)
simplecov (0.14.1)
docile (~> 1.1.0)
@@ @@ -173,7 +173,7 @@ GEM
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
stackprof (0.2.11)
- stringex (2.6.1)
+ stringex (2.8.2)
temple (0.8.0)
term-ansicolor (1.6.0)
tins (~> 1.0)
@@ @@ -191,7 +191,7 @@ PLATFORMS
ruby
DEPENDENCIES
- bundler (~> 1.7)
+ bundler (~> 1.16.1)
codeclimate-test-reporter (~> 0.4.7)
coveralls (~> 0.8.1)
flamegraph
@@ @@ -205,13 +205,13 @@ DEPENDENCIES
puma
rack-mini-profiler (~> 0.10.1)
rack-test (~> 0.8.2)
- rake (~> 10.4.2)
+ rake (~> 12.3.0)
rspec (~> 3.7.0)
stackprof
timecop (~> 0.9.1)
RUBY VERSION
- ruby 2.4.3p205
+ ruby 2.5.0p0
BUNDLED WITH
1.16.1
locomotive/steam/version.rb b/lib/locomotive/steam/version.rb +1 -1
@@ @@ -3,6 +3,6 @@
# 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
module Locomotive
module Steam
- VERSION = '1.4.0-alpha'
+ VERSION = '1.4.0-rc.1'
end
end
locomotivecms_steam.gemspec +7 -7
@@ @@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
spec.name = 'locomotivecms_steam'
spec.version = Locomotive::Steam::VERSION
spec.authors = ['Didier Lafforgue', 'Rodrigo Alvarez', 'Arnaud Sellenet', 'Joel Azemar']
- spec.email = ['did@locomotivecms.com', 'papipo@gmail.com', 'arnaud@sellenet.fr', 'joel.azemar@gmail.com']
+ spec.email = ['didier@nocoffee.fr', 'papipo@gmail.com', 'arnaud@sellenet.fr', 'joel.azemar@gmail.com']
spec.description = %q{The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine}
spec.summary = %q{The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine}
spec.homepage = 'https://github.com/locomotivecms/steam'
@@ @@ -15,16 +15,16 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']
- spec.add_development_dependency 'bundler', '~> 1.7'
- spec.add_development_dependency 'rake', '~> 10.4.2'
+ spec.add_development_dependency 'bundler', '~> 1.16.1'
+ spec.add_development_dependency 'rake', '~> 12.3.0'
spec.add_development_dependency 'mongo', '~> 2.5.1'
spec.add_development_dependency 'origin', '~> 2.3.1'
- spec.add_dependency 'nokogiri', '~> 1.8.1'
- spec.add_dependency 'sanitize', '~> 4.5.0'
+ spec.add_dependency 'nokogiri', '~> 1.8.2'
+ spec.add_dependency 'sanitize', '~> 4.6.0'
spec.add_dependency 'morphine', '~> 0.1.1'
- spec.add_dependency 'httparty', '~> 0.15.6'
+ spec.add_dependency 'httparty', '~> 0.16.0'
spec.add_dependency 'chronic', '~> 0.10.2'
spec.add_dependency 'bcrypt', '~> 3.1.11'
@@ @@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'pony', '~> 1.12'
spec.add_dependency 'locomotivecms-solid', '~> 4.0.1'
- spec.add_dependency 'locomotivecms_common', '~> 0.2.0'
+ spec.add_dependency 'locomotivecms_common', '~> 0.3.0'
spec.required_ruby_version = '>= 2.0'
end
spec/unit/services/auth_service_spec.rb +3 -1
@@ @@ -228,10 +228,12 @@ EMAIL
describe '#reset_password' do
+ let(:request) { instance_double('Request') }
let(:_auth_options) { default_auth_options }
let(:auth_options) { instance_double('AuthOptions', _auth_options) }
- subject { service.reset_password(auth_options) }
+
+ subject { service.reset_password(auth_options, request) }
context 'no auth token' do