Merge pull request browsermedia#757 from browsermedia/4.0.0_test

Fixes 4.0.0.rc1 tests

Author: jtwohiou

Gemfile

@@ -12,6 +12,9 @@ gem 'bluecloth', :groups=>[:development, :test] # For YARD
 
 gem "thin" # To avoid annoying Ruby 1.9.3/Rails/Webrick warnings - See http://stackoverflow.com/questions/7082364/what-does-warn-could-not-determine-content-length-of-response-body-mean-and-h
 
+gem 'sass-rails'
+
+
 # Uncomment to confirm that older versions work (for compaitiblity with Spree 2.2.4/bcms_spree)
 # gem 'paperclip', '~> 3.4.1'
 # For testing behavior in production
@@ -23,6 +26,8 @@ group :development do
  gem 'rake'
  # gem 'debugger'
  gem 'quiet_assets'
+ #gem 'better_errors'
+ #gem 'binding_of_caller'
 end
 group :test, :development do
  gem 'minitest'
@@ -33,7 +38,6 @@ end
 group :test do
  gem 'poltergeist'
  gem 'm', '~> 1.2'
-
  gem 'single_test'
  gem 'factory_girl_rails', '3.3.0'
  gem "mocha", :require=>false
@@ -42,7 +46,7 @@ group :test do
  # Cucumber and dependencies
  gem 'capybara'
  gem 'database_cleaner'
- gem 'cucumber-rails', :require=> false
+ gem 'cucumber-rails', '~> 1.4.1', :require=> false
  gem 'cucumber'
  gem 'launchy'
  gem 'ruby-prof'

Gemfile.lock

@@ -6,7 +6,7 @@ PATH
  ancestry (~> 2.0.0)
  bootstrap-sass
  ckeditor_rails (~> 4.3.0)
- compass-rails (~> 1.1.3)
+ compass-rails (~> 1.1.7)
  devise (~> 3.0)
  jquery-rails (~> 3.1)
  jquery-ui-rails (~> 4.1)
@@ -57,7 +57,7 @@ GEM
  childprocess (>= 0.3.6)
  cucumber (>= 1.1.1)
  rspec-expectations (>= 2.7.0)
- bcrypt (3.1.7)
+ bcrypt (3.1.10)
  bluecloth (2.2.0)
  bootstrap-sass (3.2.0.2)
  sass (~> 3.2)
@@ -70,47 +70,55 @@ GEM
  xpath (~> 2.0)
  childprocess (0.3.9)
  ffi (~> 1.0, >= 1.0.11)
- chunky_png (1.3.1)
+ chunky_png (1.3.4)
  ckeditor_rails (4.3.4)
  railties (>= 3.0)
  climate_control (0.0.3)
  activesupport (>= 3.0)
- cocaine (0.5.4)
+ cocaine (0.5.7)
  climate_control (>= 0.0.3, < 1.0)
- compass (1.0.1)
+ compass (1.0.3)
  chunky_png (~> 1.2)
- compass-core (~> 1.0.1)
+ compass-core (~> 1.0.2)
  compass-import-once (~> 1.0.5)
  rb-fsevent (>= 0.9.3)
  rb-inotify (>= 0.9)
  sass (>= 3.3.13, < 3.5)
- compass-core (1.0.1)
+ compass-core (1.0.3)
  multi_json (~> 1.0)
  sass (>= 3.3.0, < 3.5)
  compass-import-once (1.0.5)
  sass (>= 3.2, < 3.5)
  compass-rails (1.1.7)
  compass (>= 0.12.2)
  sprockets (<= 2.11.0)
- cucumber (1.3.6)
+ cucumber (2.4.0)
  builder (>= 2.1.2)
+ cucumber-core (~> 1.5.0)
+ cucumber-wire (~> 0.0.1)
  diff-lcs (>= 1.1.3)
- gherkin (~> 2.12.0)
- multi_json (~> 1.7.5)
- multi_test (>= 0.0.2)
- cucumber-rails (1.3.0)
- capybara (>= 1.1.2)
- cucumber (>= 1.1.8)
- nokogiri (>= 1.5.0)
+ gherkin (~> 4.0)
+ multi_json (>= 1.7.5, < 2.0)
+ multi_test (>= 0.1.2)
+ cucumber-core (1.5.0)
+ gherkin (~> 4.0)
+ cucumber-rails (1.4.5)
+ capybara (>= 1.1.2, < 3)
+ cucumber (>= 1.3.8, < 4)
+ mime-types (>= 1.16, < 4)
+ nokogiri (~> 1.5)
+ railties (>= 3, < 5.1)
+ cucumber-wire (0.0.1)
  daemons (1.1.9)
  database_cleaner (1.2.0)
- devise (3.3.0)
+ devise (3.5.1)
  bcrypt (~> 3.0)
  orm_adapter (~> 0.1)
  railties (>= 3.2.6, < 5)
+ responders
  thread_safe (~> 0.1)
  warden (~> 1.2.3)
- diff-lcs (1.2.4)
+ diff-lcs (1.3)
  erubis (2.7.0)
  eventmachine (1.0.3)
  execjs (1.4.0)
@@ -123,13 +131,12 @@ GEM
  faye-websocket (0.4.7)
  eventmachine (>= 0.12.0)
  ffi (1.9.0)
- gherkin (2.12.1)
- multi_json (~> 1.3)
+ gherkin (4.0.0)
  hashie (2.0.5)
  hike (1.2.3)
  http_parser.rb (0.5.3)
  i18n (0.6.11)
- jquery-rails (3.1.2)
+ jquery-rails (3.1.3)
  railties (>= 3.0, < 5.0)
  thor (>= 0.14, < 2.0)
  jquery-ui-rails (4.2.1)
@@ -145,7 +152,7 @@ GEM
  metaclass (0.0.1)
  method_source (0.8.2)
  mime-types (1.25.1)
- mini_portile (0.5.1)
+ mini_portile2 (2.1.0)
  minitest (4.7.5)
  minitest-rails (0.9.2)
  minitest (~> 4.7)
@@ -157,11 +164,11 @@ GEM
  powerbar
  mocha (0.14.0)
  metaclass (~> 0.0.1)
- multi_json (1.7.9)
- multi_test (0.0.2)
+ multi_json (1.12.1)
+ multi_test (0.1.2)
  mysql2 (0.3.13)
- nokogiri (1.6.0)
- mini_portile (~> 0.5.0)
+ nokogiri (1.6.8.1)
+ mini_portile2 (~> 2.1.0)
  orm_adapter (0.5.0)
  panoramic (0.0.4)
  rails (>= 3.0.7)
@@ -180,8 +187,8 @@ GEM
  hashie (>= 1.1.0)
  quiet_assets (1.0.2)
  railties (>= 3.1, < 5.0)
- rack (1.5.2)
- rack-test (0.6.2)
+ rack (1.5.5)
+ rack-test (0.6.3)
  rack (>= 1.0)
  rails (4.0.2)
  actionmailer (= 4.0.2)
@@ -197,13 +204,15 @@ GEM
  rake (>= 0.8.7)
  thor (>= 0.18.1, < 2.0)
  rake (10.1.1)
- rb-fsevent (0.9.4)
+ rb-fsevent (0.9.5)
  rb-inotify (0.9.5)
  ffi (>= 0.5.0)
+ responders (1.1.2)
+ railties (>= 3.2, < 4.2)
  rspec-expectations (2.14.1)
  diff-lcs (>= 1.1.3, < 2.0)
  ruby-prof (0.13.0)
- sass (3.4.5)
+ sass (3.4.16)
  sass-rails (4.0.1)
  railties (>= 4.0.0, < 5.0)
  sass (>= 3.1.10)
@@ -259,7 +268,7 @@ DEPENDENCIES
  browsercms!
  capybara
  cucumber
- cucumber-rails
+ cucumber-rails (~> 1.4.1)
  database_cleaner
  factory_girl_rails (= 3.3.0)
  launchy
@@ -273,8 +282,15 @@ DEPENDENCIES
  quiet_assets
  rake
  ruby-prof
+ sass-rails
  single_test
  sqlite3-ruby
  thin
  uglifier
  yard
+
+RUBY VERSION
+ ruby 2.0.0p645
+
+BUNDLED WITH
+ 1.14.6

app/helpers/cms/application_helper.rb

@@ -171,13 +171,15 @@ def render_pagination(collection, content_type, options={})
  if collection.blank?
  content_tag(:div, "No Content", :class => "pagination")
  else
+ content_type_constant = content_type.name.constantize
  render :partial => "pagination", :locals => {
  :collection => collection,
- :first_page_path => engine(content_type).url_for({:page => 1}.merge(options)),
- :previous_page_path => engine(content_type).url_for({:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
- :current_page_path => engine(content_type).url_for(options),
- :next_page_path => engine(content_type).url_for({:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
- :last_page_path => engine(content_type).url_for({:page => collection.total_pages}.merge(options))
+ :first_page_path => engine(content_type_constant).polymorphic_path(content_type_constant,{:page => 1}.merge(options)),
+ :previous_page_path => engine(content_type_constant).polymorphic_path(content_type_constant,{:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
+ :current_page_path => engine(content_type_constant.name.constantize).polymorphic_path(content_type_constant, options),
+ :next_page_path => engine(content_type_constant).polymorphic_path(content_type_constant,{:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
+ :last_page_path => engine(content_type_constant).polymorphic_path(content_type_constant,{:page => collection.total_pages}.merge(options)),
+ :content_type => content_type
  }
  end
  end

app/inputs/attachments_input.rb

@@ -1,6 +1,6 @@
 class AttachmentsInput < SimpleForm::Inputs::Base
 
- def input
+ def input(wrapper_options)
  definitions = Cms::Attachment.definitions_for(object.class.name, :multiple)
  if definitions.empty?
  template.render(partial: 'cms/attachments/no_attachments_defined', locals: {object: object})

app/inputs/cms_text_area_input.rb

@@ -3,7 +3,7 @@
 class CmsTextAreaInput < SimpleForm::Inputs::TextInput
 
  include Cms::FormBuilder::DefaultInput
- def input
+ def input(wrapper_options)
  extract_default
  @builder.text_area(attribute_name, input_html_options).html_safe
  end

app/inputs/date_picker_input.rb

@@ -2,7 +2,7 @@
 # 1. Allows for empty dates (i.e. no date)
 class DatePickerInput < SimpleForm::Inputs::TextInput
 
- def input
+ def input(wrapper_options)
  @builder.text_field(attribute_name, input_html_options).html_safe
  end
 end

app/inputs/file_picker_input.rb

@@ -6,7 +6,7 @@
 # @option options [String] :hint (blank) Helpful tips for the person entering the field, appears blank if nothing is specified.
 class FilePickerInput < SimpleForm::Inputs::Base
 
- def input
+ def input(wrapper_options)
  # New blocks will not have their attachments created yet.
  object.ensure_attachment_exists if object.respond_to?(:ensure_attachment_exists)
 

app/inputs/name_input.rb

@@ -14,7 +14,7 @@ def initialize(*args)
  options[:placeholder] = "Name" if options[:placeholder].nil?
  end
 
- def input
+ def input(wrapper_options)
  add_slug_source_for_content_that_needs_it
 
  unless options[:label]

app/inputs/path_input.rb

@@ -1,6 +1,6 @@
 class PathInput < SimpleForm::Inputs::TextInput
 
- def input
+ def input(wrapper_options)
  if forecasting_a_new_section?
  options[:hint] = "Forecast: Saving this first #{object.class.display_name} will create a new section at #{object.class.path}."
  end

app/inputs/template_editor_input.rb

@@ -2,11 +2,11 @@ class TemplateEditorInput < SimpleForm::Inputs::TextInput
 
  include Cms::FormBuilder::DefaultInput
 
- def label
+ def label(wrapper_options)
  super if render_template_input?
  end
 
- def input
+ def input(wrapper_options)
  if render_template_input?
  options[:default] = object.class.default_template
  options[:default_handler] = "erb" unless options[:default_handler]