comfortable_mexican_sofa 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8a895885924f76db32a69c36575c4eab59b778
-  data.tar.gz: 54afe80d356c995147bbe41bb14aa672f08fbbc9
+  metadata.gz: fb7afcd2d6042c08dd39429cbf714394ab50b286
+  data.tar.gz: 1ad39a72dc37a220429932e9df775373b7ee83c2
 SHA512:
-  metadata.gz: d750c6640bccd486e359146c2f04a3e01b293a9d39c730cbab707c4afc1534eb4a5c4eaae8cbde73c42dce443e0776f11e97699e41d40be6eb93efbde79e0c43
-  data.tar.gz: 47de41b4008aeac1fdd548b80fb698bbc88737d0df9285f196e497cf57e40d5b3ea02840dcc4c4f962b3660f52e82a611db947e79cb11450d99eefa79d366e61
+  metadata.gz: 6421a3b93ae6e47689a3fff0066334c4fe8da857d363863d35cf292a757972faa0ff54ae079ab317753549c6d0e435c1a37842e8f592d9ce4547794ad3d1ba88
+  data.tar.gz: 3eb62f07989bf29b0b0d15409b989b806c44da21a1357c19a3694ae4c7b6099a5d410f25c9abec25cbb3dc056d4e54e1f5565fdc5f79f7b8fe1ac7d5c423c6ac

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.5
-  - 2.4.2
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 gemfile:
-  - test/gemfiles/Gemfile.rails.5.2
+  - test/gemfiles/5.2.gemfile
 branches:
   only:
     - master
@@ -14,6 +15,9 @@ addons:
   apt:
     packages:
     - google-chrome-stable
+before_install:
+  - gem update --system
+  - gem update bundler
 before_script:
   - wget http://chromedriver.storage.googleapis.com/2.34/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
@@ -28,4 +32,4 @@ script:
   - bundle exec rake db:migrate
   - bundle exec rake test
   - SKIP_COV=true bundle exec rake test:system
-  - bundle exec rubocop
+  - bundle exec rubocop

data/CONTRIBUTING.md

@@ -9,10 +9,12 @@ Fork the project. Optionally, create a branch you want to work on.
 ### 2. Get it running locally
 
 - Install gem dependencies with `bundle install`
-- There's nothing to configure, by default database is SQLite so it will be created for you.
-  Just run `rake db:migrate`
-- Make sure that existing tests are passing by running `rake test`
-- You should be able to start the app via `rails s` and navigate to http://localhost:3000/admin
+- There's nothing to configure, by default database is SQLite so it will be
+  created for you. Just run `bundle exec rake db:migrate`
+- Make sure that existing tests are passing by running `bundle exec rake test`
+- There are system tests that can be run with `bundle exec rake test:system`.
+  You need to have `chromedriver` installed for that.
+- You should be able to start the app via `bin/rails s` and navigate to http://localhost:3000/admin
 
 ### 3. Hack away
 
@@ -29,4 +31,5 @@ Fork the project. Optionally, create a branch you want to work on.
 
 ### 5. Done!
 
-If everything is good your changes will be merged into master branch. Eventually a new version of gem will be published.
+If everything is good your changes will be merged into master branch. Eventually
+a new version of gem will be published.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 Oleg Khabarov
+Copyright (c) 2010-2018 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -50,7 +50,7 @@ comfy_route :cms, path: "/"
 
 ## Quick Start Guide
 
-After finishing installation you should be able to navigate to http://yoursite/admin
+After finishing installation you should be able to navigate to http://localhost:3000/admin
 
 Default username and password is 'username' and 'password'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable\_mexican\_sofa.rb](https://github.com/comfy/comfortable-mexican-sofa/blob/master/config/initializers/comfortable_mexican_sofa.rb)
 
@@ -73,7 +73,7 @@ Once you have a layout, you may start creating pages and populating content. It'
 
 For more information please refer to [Wiki](https://github.com/comfy/comfortable-mexican-sofa/wiki).
 
-![Admin Area Preview](https://github.com/comfy/comfortable-mexican-sofa/raw/master/doc/preview.jpg)
+![Admin Area Preview](doc/preview.jpg)
 
 #### Old Versions
 
@@ -83,6 +83,14 @@ With Rails 4.2 and 5.0 use gem version [1.12.10](https://rubygems.org/gems/comfo
 
 With Rails 3.0 use gem version [1.8.5](https://rubygems.org/gems/comfortable_mexican_sofa/versions/1.8.5)
 
+#### Contributing
+
+ComfortableMexicanSofa repository can be ran like a regular Rails application in
+development environment. It's as easy to work on as any other Rails app out there.
+For more detail take a look at [CONTRIBUTING](CONTRIBUTING.md)
+
+[![Help Contribute to Open Source](https://www.codetriage.com/comfy/comfortable-mexican-sofa/badges/users.svg)](https://www.codetriage.com/comfy/comfortable-mexican-sofa)
+
 #### Help and Contact
 
 Gitter: https://gitter.im/comfy/comfortable-mexican-sofa
@@ -91,10 +99,8 @@ Twitter: [@GroceryBagHead](https://twitter.com/grocerybaghead)
 
 #### Acknowledgements
 
-* Big thanks to Roman Almeida ([@nasmorn](https://github.com/nasmorn)) for contributing OEM License for [Redactor Text Editor](http://imperavi.com/redactor)
+Thanks to [Roman Almeida](https://github.com/nasmorn) for contributing OEM License for [Redactor Text Editor](http://imperavi.com/redactor)
 
 ---
 
-ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE)
-
-Copyright 2010-2017 Oleg Khabarov
+Copyright 2010-2018 Oleg Khabarov. Released under the [MIT license](LICENSE)

data/app/assets/javascripts/comfy/admin/cms/base.js.coffee

@@ -20,8 +20,25 @@ window.CMS.init = ->
   CMS.page_update_preview()
   CMS.categories()
   CMS.files()
+  CMS.upload_queue()
   CMS.diff()
 
+
+window.CMS.upload_queue = ->
+  if $("#cms-uploader").length
+    uploader_url  = $("meta[name='cms-uploader-url']").attr("content")
+    token_name    = $("meta[name='cms-uploader-token-name']").attr("content")
+    token_value   = $("meta[name='cms-uploader-token-value']").attr("content")
+    session_name  = $("meta[name='cms-uploader-session-name']").attr("content")
+    session_value = $("meta[name='cms-uploader-session-value']").attr("content")
+
+    window.CMS.uploader $("#cms-uploader"),
+      url: uploader_url,
+      multipart_params:
+        "#{token_name}": token_value,
+        "#{session_name}": session_value
+
+
 window.CMS.slugify = ->
   slugify = (str) ->
     # Trim string and lower case.
@@ -80,18 +97,21 @@ window.CMS.wysiwyg = ->
   if (csrf_param != undefined && csrf_token != undefined)
     params = csrf_param + "=" + encodeURIComponent(csrf_token)
 
+  file_upload_path  = $("meta[name='cms-file-upload-path']").attr("content")
+  pages_path        = $("meta[name='cms-pages-path']").attr("content")
+
   $('textarea.rich-text-editor, textarea[data-cms-rich-text]').redactor
     minHeight:        160
     autoresize:       true
-    imageUpload:      "#{CMS.file_upload_path}?source=redactor&type=image&#{params}"
-    imageManagerJson: "#{CMS.file_upload_path}?source=redactor&type=image"
-    fileUpload:       "#{CMS.file_upload_path}?source=redactor&type=file&#{params}"
-    fileManagerJson:  "#{CMS.file_upload_path}?source=redactor&type=file"
-    definedLinks:     "#{CMS.pages_path}?source=redactor"
+    imageUpload:      "#{file_upload_path}?source=redactor&type=image&#{params}"
+    imageManagerJson: "#{file_upload_path}?source=redactor&type=image"
+    fileUpload:       "#{file_upload_path}?source=redactor&type=file&#{params}"
+    fileManagerJson:  "#{file_upload_path}?source=redactor&type=file"
+    definedLinks:     "#{pages_path}?source=redactor"
     buttonSource:     true
     formatting:       ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']
     plugins:          ['imagemanager', 'filemanager', 'table', 'video', 'definedlinks']
-    lang:             CMS.locale
+    lang:             $("meta[name='cms-locale']").attr("content")
     convertDivs:      false
 
 
@@ -140,11 +160,11 @@ window.CMS.timepicker = ->
   $('input[type=text][data-cms-datetime]').flatpickr
     format:     'yyyy-mm-dd hh:ii'
     enableTime: true
-    locale:     CMS.locale
+    locale:     $("meta[name='cms-locale']").attr("content")
 
   $('input[type=text][data-cms-date]').flatpickr
     format: 'yyyy-mm-dd',
-    locale: CMS.locale
+    locale: $("meta[name='cms-locale']").attr("content")
 
 
 window.CMS.page_fragments = ->

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -9,7 +9,7 @@
         .item-title
           - if file.attachment.image?
             - variant = file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
-            - thumb = image_tag variant, size: "200x150"
+            - thumb = image_tag(url_for(variant), size: "200x150")
           = link_to file.attachment, target: "_blank", data: {toggle: "page-file-popover", content: thumb} do
             = file.label
 

data/app/views/comfy/admin/cms/files/index.html.haml

@@ -1,3 +1,12 @@
+- content_for :head do
+
+  - uploader_url = comfy_admin_cms_site_files_path(@site, source: :plupload, categories: params[:categories])
+  %meta{name: "cms-uploader-url",           content: uploader_url}
+  %meta{name: "cms-uploader-token-name",    content: request_forgery_protection_token}
+  %meta{name: "cms-uploader-token-value",   content: form_authenticity_token}
+  %meta{name: "cms-uploader-session-name",  content: Rails.application.config.session_options[:key]}
+  %meta{name: "cms-uploader-session-value", content: request.session_options[:id]}
+
 - content_for :right_column do
   = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File"
 
@@ -18,15 +27,3 @@
   = comfy_admin_partial "comfy/admin/cms/partials/files_after"
 
   = comfy_paginate @files
-
-- content_for :javascript do
-  :javascript
-    $(function(){
-      window.CMS.uploader($("#cms-uploader"), {
-        url: '#{comfy_admin_cms_site_files_path(@site, source: :plupload, category: params[:category])}',
-        multipart_params: {
-          '#{request_forgery_protection_token}': '#{form_authenticity_token}',
-          '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'
-        }
-      });
-    });

data/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml

@@ -2,7 +2,7 @@
   - attachments.each do |attachment|
     - if attachment.image?
       - variant = attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
-      - thumb = image_tag variant, size: "200x150"
+      - thumb = image_tag(url_for(variant), size: "200x150")
     .btn.btn-outline-light
       = link_to attachment.filename, attachment, {data: {toggle: "page-file-popover", content: thumb}}
       %label.custom-control.custom-checkbox

data/app/views/layouts/comfy/admin/cms/_footer_js.html.haml

@@ -2,11 +2,5 @@
 
 = javascript_include_tag "comfy/admin/cms/application", "data-turbolinks-track": "reload"
 
-- if @site && @site.persisted?
-  :javascript
-    CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(@site)}';
-    CMS.pages_path        = '#{comfy_admin_cms_site_pages_path(@site)}';
-    CMS.locale            = '#{I18n.locale}';
-
 - if content_for(:javascript)
   = yield :javascript

data/app/views/layouts/comfy/admin/cms/_head.html.haml

@@ -7,6 +7,11 @@
 
   = csrf_meta_tag
 
+  - if @site && @site.persisted?
+    %meta{name: "cms-file-upload-path", content: comfy_admin_cms_site_files_path(@site)}
+    %meta{name: "cms-pages-path",       content: comfy_admin_cms_site_pages_path(@site)}
+    %meta{name: "cms-locale",           content: I18n.locale}
+
   = stylesheet_link_tag "comfy/admin/cms/application", media: "all", "data-turbolinks-track": "reload"
 
   = yield :head

data/comfortable_mexican_sofa.gemspec

@@ -10,10 +10,7 @@ Gem::Specification.new do |s|
   s.summary       = "Rails 5.2+ CMS Engine"
   s.description   = "ComfortableMexicanSofa is a powerful Rails 5.2+ CMS Engine"
   s.license       = "MIT"
-
   s.files         = `git ls-files`.split("\n")
-  s.platform      = Gem::Platform::RUBY
-  s.require_paths = ["lib"]
 
   s.required_ruby_version = ">= 2.2.2"
 

data/config/initializers/comfortable_mexican_sofa.rb

@@ -36,18 +36,6 @@ ComfortableMexicanSofa.configure do |config|
   # Path where seeds can be located.
   #   config.seeds_path = File.expand_path('db/cms_seeds', Rails.root)
 
-  # Importing fixtures into Database
-  # To load fixtures into the database just run this rake task:
-  #   local: $ rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=localhost
-  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=yourapp.herokuapp.com
-  # From indicates folder the fixtures are in and to is the Site hostname you have defined in the database.
-
-  # Exporting fixtures into Files
-  # If you need to dump database contents into fixture files run:
-  #   local: $ rake comfortable_mexican_sofa:fixtures:export FROM=localhost TO=example.local
-  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:export FROM=yourapp.herokuapp.com TO=example.local
-  # This will create example.local folder and dump all content from example.com Site.
-
   # Content for Layouts, Pages and Snippets has a revision history. You can revert
   # a previous version using this system. You can control how many revisions per
   # object you want to keep. Set it to 0 if you wish to turn this feature off.

data/lib/comfortable_mexican_sofa/content/tags/file.rb

@@ -12,6 +12,8 @@ class ComfortableMexicanSofa::Content::Tag::File < ComfortableMexicanSofa::Conte
 
   attr_reader :as, :variant_attrs
 
+  delegate :rails_blob_path, to: "Rails.application.routes.url_helpers"
+
   def initialize(context, params_string)
     super
     @as             = options["as"] || "url"
@@ -26,13 +28,15 @@ class ComfortableMexicanSofa::Content::Tag::File < ComfortableMexicanSofa::Conte
       file = file.variant(@variant_attrs)
     end
 
+    url = rails_blob_path(file, only_path: true)
+
     case @as
     when "link"
-      "<a href='#{url_for(file)}' target='_blank'>#{label}</a>"
+      "<a href='#{url}' target='_blank'>#{label}</a>"
     when "image"
-      "<img src='#{url_for(file)}' alt='#{label}'/>"
+      "<img src='#{url}' alt='#{label}'/>"
     else
-      url_for(file)
+      url
     end
   end
 
@@ -65,13 +69,6 @@ protected
     @label || attachment && attachment.filename
   end
 
-  def url_for(attachment)
-    ApplicationController.render(
-      inline: "<%= url_for(@attachment) %>",
-      assigns: { attachment: attachment }
-    )
-  end
-
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/file_link.rb

@@ -12,6 +12,8 @@ class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::C
 
   attr_reader :identifier, :as, :variant_attrs
 
+  delegate :rails_blob_path, to: "Rails.application.routes.url_helpers"
+
   def initialize(context, params_string)
     super
 
@@ -41,25 +43,18 @@ class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::C
       attachment = attachment.variant(@variant_attrs)
     end
 
+    url = rails_blob_path(attachment, only_path: true)
+
     case @as
     when "link"
-      "<a href='#{url_for(attachment)}' target='_blank'>#{label}</a>"
+      "<a href='#{url}' target='_blank'>#{label}</a>"
     when "image"
-      "<img src='#{url_for(attachment)}' alt='#{label}'/>"
+      "<img src='#{url}' alt='#{label}'/>"
     else
-      url_for(attachment)
+      url
     end
   end
 
-protected
-
-  def url_for(attachment)
-    ApplicationController.render(
-      inline: "<%= url_for(@attachment) %>",
-      assigns: { attachment: attachment }
-    )
-  end
-
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb

@@ -7,7 +7,7 @@ module ComfortableMexicanSofa::HasRevisions
   module ClassMethods
 
     def cms_has_revisions_for(*fields)
-      include ComfortableMexicanSofa::HasRevisions::InstanceMethods # rubocop:disable Style/MixinUsage
+      include ComfortableMexicanSofa::HasRevisions::InstanceMethods
 
       attr_accessor :revision_data
 

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,5 +1,5 @@
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.7".freeze
+  VERSION = "2.0.8".freeze
 
 end

data/test/integration/meta_variables_test.rb

@@ -0,0 +1,27 @@
+require_relative "../test_helper"
+
+class MetaVariablesIntegrationTest < ActionDispatch::IntegrationTest
+
+  def test_redactor_js_variables
+    site = comfy_cms_sites(:default)
+    r :get, comfy_admin_cms_site_pages_path(site)
+    assert_response :success
+
+    assert_select "meta[name='cms-file-upload-path'][content='#{comfy_admin_cms_site_files_path(site)}']"
+    assert_select "meta[name='cms-pages-path'][content='#{comfy_admin_cms_site_pages_path(site)}']"
+    assert_select "meta[name='cms-locale'][content='en']"
+  end
+
+  def test_plupload_js_variables
+    site = comfy_cms_sites(:default)
+    r :get, comfy_admin_cms_site_files_path(site)
+    assert_response :success
+
+    assert_select "meta[name='cms-uploader-url']"
+    assert_select "meta[name='cms-uploader-token-name']"
+    assert_select "meta[name='cms-uploader-token-value']"
+    assert_select "meta[name='cms-uploader-session-name']"
+    assert_select "meta[name='cms-uploader-session-value']"
+  end
+
+end

data/test/lib/content/tags/file_link_test.rb

@@ -2,18 +2,13 @@ require_relative "../../../test_helper"
 
 class ContentTagsFileLinkTest < ActiveSupport::TestCase
 
+  delegate :rails_blob_path, to: "Rails.application.routes.url_helpers"
+
   setup do
     @page = comfy_cms_pages(:default)
     @file = comfy_cms_files(:default)
   end
 
-  def url_for(attachment)
-    ApplicationController.render(
-      inline: "<%= url_for(@attachment) %>",
-      assigns: { attachment: attachment }
-    )
-  end
-
   # -- Tests -------------------------------------------------------------------
 
   def test_init
@@ -51,21 +46,23 @@ class ContentTagsFileLinkTest < ActiveSupport::TestCase
 
   def test_content
     tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, @file.id)
-    out = url_for(tag.file.attachment)
+    out = rails_blob_path(tag.file.attachment, only_path: true)
     assert_equal out, tag.content
     assert_equal out, tag.render
   end
 
   def test_content_as_link
     tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "#{@file.id}, as: link")
-    out = "<a href='#{url_for(tag.file.attachment)}' target='_blank'>default file</a>"
+    url = rails_blob_path(tag.file.attachment, only_path: true)
+    out = "<a href='#{url}' target='_blank'>default file</a>"
     assert_equal out, tag.content
     assert_equal out, tag.render
   end
 
   def test_content_as_image
     tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "#{@file.id}, as: image")
-    out = "<img src='#{url_for(tag.file.attachment)}' alt='default file'/>"
+    url = rails_blob_path(tag.file.attachment, only_path: true)
+    out = "<img src='#{url}' alt='default file'/>"
     assert_equal out, tag.content
     assert_equal out, tag.render
   end

data/test/lib/content/tags/file_test.rb

@@ -2,17 +2,12 @@ require_relative "../../../test_helper"
 
 class ContentTagsFileTest < ActiveSupport::TestCase
 
+  delegate :rails_blob_path, to: "Rails.application.routes.url_helpers"
+
   setup do
     @page = comfy_cms_pages(:default)
   end
 
-  def url_for(attachment)
-    ApplicationController.render(
-      inline: "<%= url_for(@attachment) %>",
-      assigns: { attachment: attachment }
-    )
-  end
-
   # -- Tests -------------------------------------------------------------------
 
   def test_init
@@ -36,20 +31,20 @@ class ContentTagsFileTest < ActiveSupport::TestCase
   def test_content
     frag = comfy_cms_fragments(:file)
     tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, frag.identifier)
-    assert_equal url_for(frag.attachments.first), tag.content
+    assert_equal rails_blob_path(frag.attachments.first, only_path: true), tag.content
   end
 
   def test_content_as_link
     frag = comfy_cms_fragments(:file)
     tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, "#{frag.identifier}, as: link")
-    out = "<a href='#{url_for(frag.attachments.first)}' target='_blank'>fragment.jpg</a>"
+    out = "<a href='#{rails_blob_path(frag.attachments.first, only_path: true)}' target='_blank'>fragment.jpg</a>"
     assert_equal out, tag.content
   end
 
   def test_content_as_image
     frag = comfy_cms_fragments(:file)
     tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, "#{frag.identifier}, as: image")
-    out = "<img src='#{url_for(frag.attachments.first)}' alt='fragment.jpg'/>"
+    out = "<img src='#{rails_blob_path(frag.attachments.first, only_path: true)}' alt='fragment.jpg'/>"
     assert_equal out, tag.content
   end
 

data/test/lib/content/tags/files_test.rb

@@ -2,17 +2,12 @@ require_relative "../../../test_helper"
 
 class ContentTagsFilesTest < ActiveSupport::TestCase
 
+  delegate :rails_blob_path, to: "Rails.application.routes.url_helpers"
+
   setup do
     @page = comfy_cms_pages(:default)
   end
 
-  def url_for(attachment)
-    ApplicationController.render(
-      inline: "<%= url_for(@attachment) %>",
-      assigns: { attachment: attachment }
-    )
-  end
-
   # -- Tests -------------------------------------------------------------------
 
   def test_init
@@ -38,7 +33,7 @@ class ContentTagsFilesTest < ActiveSupport::TestCase
     frag.update_attribute(:tag, "files")
     frag.update_attribute(:files, fixture_file_upload("files/image.jpg", "image/jpeg"))
     tag = ComfortableMexicanSofa::Content::Tag::Files.new(@page, frag.identifier)
-    out = frag.attachments.map { |a| url_for(a) }.join(" ")
+    out = frag.attachments.map { |a| rails_blob_path(a, only_path: true) }.join(" ")
     assert_equal out, tag.content
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-24 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -667,7 +667,7 @@ files:
 - test/fixtures/views/render_test/_test.html.erb
 - test/fixtures/views/render_test/new.html.erb
 - test/fixtures/views/render_test/render_layout.html.erb
-- test/gemfiles/Gemfile.rails.5.2
+- test/gemfiles/5.2.gemfile
 - test/generators/cms_assets_generator_test.rb
 - test/generators/cms_controllers_generator_test.rb
 - test/generators/cms_generator_test.rb
@@ -677,7 +677,7 @@ files:
 - test/helpers/cms_helper_test.rb
 - test/integration/access_control_test.rb
 - test/integration/i18n_test.rb
-- test/integration/js_variables_test.rb
+- test/integration/meta_variables_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/routing_test.rb
 - test/integration/seeds_test.rb

data/test/integration/js_variables_test.rb

@@ -1,21 +0,0 @@
-require_relative "../test_helper"
-
-class JsVariablesIntegrationTest < ActionDispatch::IntegrationTest
-
-  def test_redactor_js_variables
-    site = comfy_cms_sites(:default)
-    r :get, comfy_admin_cms_site_pages_path(site)
-    assert_response :success
-
-    js_vars = <<-HTML.strip_heredoc
-      <script>
-        CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(site)}';
-        CMS.pages_path        = '#{comfy_admin_cms_site_pages_path(site)}';
-        CMS.locale            = 'en';
-      </script>
-    HTML
-
-    assert response.body.match(js_vars)
-  end
-
-end