diff --git a/Gemfile.lock b/Gemfile.lock index ca561940..c2a96c64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ PATH carrierwave-mongoid (~> 0.1.3) cells (~> 3.8.0) codemirror-rails (~> 2.21) - custom_fields (~> 2.0.0.rc10) + custom_fields (~> 2.0.0.rc11) devise (~> 1.5.3) dragonfly (~> 0.9.8) flash_cookie_session (~> 1.1.1) @@ -133,10 +133,10 @@ GEM capybara (>= 1.1.2) cucumber (>= 1.1.8) nokogiri (>= 1.5.0) - custom_fields (2.0.0.rc10) + custom_fields (2.0.0.rc11) activesupport (~> 3.2.1) carrierwave-mongoid (~> 0.1.3) - mongoid (~> 2.4.7) + mongoid (~> 2.4.9) database_cleaner (0.7.2) devise (1.5.3) bcrypt-ruby (~> 3.0) @@ -222,7 +222,7 @@ GEM activemodel (~> 3.1) mongo (~> 1.3) tzinfo (~> 0.3.22) - multi_json (1.3.5) + multi_json (1.3.6) multi_xml (0.5.1) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -297,7 +297,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.21.2) + selenium-webdriver (2.22.0) childprocess (>= 0.2.5) ffi (~> 1.0) libwebsocket (~> 0.1.3) diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index 0bb98137..4cc34b45 100755 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -30,12 +30,11 @@ Gem::Specification.new do |s| s.add_dependency 'mongoid', '~> 2.4.9' s.add_dependency 'locomotive-mongoid-tree', '~> 0.6.2' - s.add_dependency 'custom_fields', '~> 2.0.0.rc10' + s.add_dependency 'custom_fields', '~> 2.0.0.rc11' s.add_dependency 'kaminari', '~> 0.13.0' s.add_dependency 'haml', '~> 3.1.4' - # s.add_dependency 'jquery-rails', '~> 2.0.0' #'~> 1.0.16' s.add_dependency 'jquery-rails', '~> 1.0.19' s.add_dependency 'rails-backbone', '~> 0.6.1' s.add_dependency 'codemirror-rails', '~> 2.21' diff --git a/spec/models/locomotive/content_entry_spec.rb b/spec/models/locomotive/content_entry_spec.rb index c11097c0..bea92282 100644 --- a/spec/models/locomotive/content_entry_spec.rb +++ b/spec/models/locomotive/content_entry_spec.rb @@ -168,9 +168,9 @@ describe Locomotive::ContentEntry do @content_entry = build_content_entry end - it 'is visible by default' do + it 'is not visible by default' do @content_entry.send(:set_visibility) - @content_entry.visible?.should be_true + @content_entry.visible?.should be_false end it 'can be visible even if it is nil' do