Skip to content

Commit

Permalink
new version of Steam (1.0.0.rc7) + bump version to 3.0.0.rc5
Browse files Browse the repository at this point in the history
  • Loading branch information
did committed Dec 4, 2015
1 parent 32f5b77 commit 999261f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
19 changes: 10 additions & 9 deletions Gemfile.lock
Expand Up @@ -7,7 +7,7 @@ GIT
PATH
remote: .
specs:
locomotivecms (3.0.0.rc4)
locomotivecms (3.0.0.rc5)
actionmailer-with-request (~> 0.4.0)
autoprefixer-rails (~> 6.0.3)
bazaar (~> 0.0.2)
Expand All @@ -28,7 +28,7 @@ PATH
jquery-rails (~> 4.0.3)
jquery-ui-rails (~> 5.0.3)
kaminari (~> 0.16.3)
locomotivecms_steam (~> 1.0.0.rc6)
locomotivecms_steam (~> 1.0.0.rc7)
mime-types (~> 2.5)
mimetype-fu (~> 0.1.2)
mongo_session_store-rails4 (~> 6.0.0)
Expand Down Expand Up @@ -116,7 +116,7 @@ GEM
sass (>= 3.3.0)
bson (3.2.6)
builder (3.2.2)
byebug (8.2.0)
byebug (8.2.1)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -222,7 +222,7 @@ GEM
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faye-websocket (0.10.1)
faye-websocket (0.10.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.10)
Expand Down Expand Up @@ -295,7 +295,7 @@ GEM
attr_extras (~> 4.4.0)
colorize
stringex (~> 2.5.2)
locomotivecms_steam (1.0.0.rc6)
locomotivecms_steam (1.0.0.rc7)
RedCloth (~> 4.2.9)
chronic (~> 0.10.2)
coffee-script (~> 2.4.1)
Expand All @@ -311,6 +311,7 @@ GEM
moneta (~> 0.8.0)
mongo (~> 2.1.2)
morphine (~> 0.1.1)
nokogiri (~> 1.6.6.4)
origin (~> 2.1.1)
rack-cache (~> 1.2)
rack-rewrite (~> 1.5.1)
Expand All @@ -327,7 +328,7 @@ GEM
mime-types (2.6.2)
mimetype-fu (0.1.2)
mini_portile (0.6.2)
minitest (5.8.2)
minitest (5.8.3)
moneta (0.8.0)
monetize (1.1.0)
money (~> 6.5.0)
Expand All @@ -353,7 +354,7 @@ GEM
multi_xml (0.5.5)
net-ssh (2.10.1.rc2)
netrc (0.11.0)
nokogiri (1.6.6.2)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
nokogumbo (1.4.1)
nokogiri
Expand Down Expand Up @@ -411,7 +412,7 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails-i18n (4.0.6)
rails-i18n (4.0.7)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.5)
Expand Down Expand Up @@ -507,7 +508,7 @@ GEM
thread_safe (0.3.5)
tilt (1.4.1)
timecop (0.7.4)
tins (1.7.0)
tins (1.8.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
Expand Down
2 changes: 1 addition & 1 deletion lib/locomotive/version.rb
Expand Up @@ -2,5 +2,5 @@
# MAJOR.MINOR.PATCH format.
# 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 #:nodoc
VERSION = '3.0.0.rc4'
VERSION = '3.0.0.rc5'
end
2 changes: 1 addition & 1 deletion locomotive_cms.gemspec
Expand Up @@ -39,7 +39,7 @@ Gem::Specification.new do |s|
s.add_dependency 'mime-types', '~> 2.5'
s.add_dependency 'custom_fields', '~> 2.5.0.rc1'

s.add_dependency 'locomotivecms_steam', '~> 1.0.0.rc6'
s.add_dependency 'locomotivecms_steam', '~> 1.0.0.rc7'

s.add_dependency 'slim', '~> 3.0.6'
s.add_dependency 'simple_form', '~> 3.2.0'
Expand Down
Expand Up @@ -19,7 +19,7 @@

describe '#parse' do

let(:parent) { instance_double('ParsedPage', liquid_source: 'Hello {% block content %}!{% endblock %}') }
let(:parent) { instance_double('ParsedParentPage', liquid_source: 'Hello {% block content %}!{% endblock %}', handle: nil, slug: nil) }
let(:page) { instance_double('ParsedPage', _id: '0001', liquid_source: '{% extends parent %}{% block content %}world{{ block.super}}{% endblock %}') }
let(:parent_finder) { instance_double('ParentFinder', find: parent) }

Expand Down
2 changes: 1 addition & 1 deletion spec/requests/locomotive/steam/cache_spec.rb
Expand Up @@ -39,7 +39,7 @@

subject { middleware.send(:cache_key, steam_env) }

it { expect(subject).to eq 'd099597c3f59bb17f8a18443611ec654' }
it { expect(subject).to eq '2dbc65c2496339c339fe4977f8301d57' }

end

Expand Down

0 comments on commit 999261f

Please sign in to comment.