lcms-engine 0.1.4 → 0.2.0

data/lcms-engine.gemspec

@@ -21,111 +21,97 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'active_model_serializers', '~> 0.9.3'
+  s.add_dependency 'active_model_serializers', '~> 0.10.10'
   s.add_dependency 'activejob-retry', '~> 0.6.3'
-  s.add_dependency 'acts-as-taggable-on', '~> 5.0'
-  s.add_dependency 'acts_as_list', '~> 0.9.10'
-  s.add_dependency 'addressable', '~> 2.5.1'
-  s.add_dependency 'airbrake', ' ~> 10'
-  s.add_dependency 'autoprefixer-rails', '~> 6.4.0'
-  s.add_dependency 'aws-sdk-rails', '~> 1.0'
-  s.add_dependency 'backport_new_renderer', '~> 1.0.0'
-  s.add_dependency 'bigdecimal', '~> 1.4' # Required to handle BigDecimal.new Rails 4 issue
-  s.add_dependency 'bitly', '~> 1.0'
+  s.add_dependency 'acts-as-taggable-on', '~> 6.5.0'
+  s.add_dependency 'acts_as_list', '~> 1.0.0'
+  s.add_dependency 'addressable', '~> 2.7.0'
+  s.add_dependency 'airbrake', '~> 10.0.1'
+  s.add_dependency 'autoprefixer-rails', '~> 9.7.4'
+  s.add_dependency 'aws-sdk-rails', '~> 3.1'
+  s.add_dependency 'aws-sdk-s3', '~> 1'
+  s.add_dependency 'bitly', '~> 1.1.2'
   s.add_dependency 'bootstrap-sass', '~> 3.4.1'
-  s.add_dependency 'bullet', '~> 5.7.3'
-  s.add_dependency 'carrierwave', '~> 1'
-  s.add_dependency 'ckeditor', '~> 4'
-  s.add_dependency 'closure_tree', '~> 7'
-  s.add_dependency 'coffee-rails', '~> 4.1.1'
-  s.add_dependency 'combine_pdf', '~> 1.0.15'
-  s.add_dependency 'daemons', '~> 1.2', '>= 1.2.3'
-  s.add_dependency 'devise', '~> 4'
-  s.add_dependency 'elasticsearch-dsl', '~> 0.1.6'
-  s.add_dependency 'elasticsearch-model', '~> 6.0'
-  s.add_dependency 'elasticsearch-persistence', '~> 6.0'
-  s.add_dependency 'elasticsearch-rails', '~> 6.0'
-  s.add_dependency 'fog-aws', '~> 2.0'
-  s.add_dependency 'font-awesome-sass', '~> 4.7.0'
-  s.add_dependency 'foreman', '~> 0.78.0'
-  s.add_dependency 'foundation-rails', '~> 6.2.1'
-  s.add_dependency 'google-api-client', '~> 0.30'
-  s.add_dependency 'heap', '~> 1.0'
-  s.add_dependency 'hiredis', '~> 0.6'
-  s.add_dependency 'httparty', '~> 0.16'
-  s.add_dependency 'jbuilder', '~> 2.0'
-  s.add_dependency 'jquery-rails', '~> 4.3'
-  s.add_dependency 'js-routes', '~> 1.1.2'
-  s.add_dependency 'lt-google-api', '~> 0.1'
-  s.add_dependency 'lt-lcms', '~> 0.3.0'
-  s.add_dependency 'migration_data', '~> 0.2.1'
-  s.add_dependency 'mini_magick', '~> 4.9', '>= 4.9.4'
-  s.add_dependency 'nested_form', '~> 0.3'
-  s.add_dependency 'newrelic_rpm', '~> 6.9'
+  s.add_dependency 'bullet', '~> 6.1.0'
+  s.add_dependency 'carrierwave', '~> 2.1.0'
+  s.add_dependency 'ckeditor', '~> 4.3.0'
+  s.add_dependency 'closure_tree', '~> 7.1.0'
+  s.add_dependency 'combine_pdf', '~> 1.0.16'
+  s.add_dependency 'daemons', '~> 1.3.1'
+  s.add_dependency 'devise', '~> 4.7.1'
+  s.add_dependency 'elasticsearch-dsl', '~> 0.1.9'
+  s.add_dependency 'elasticsearch-model', '~> 7.0.0'
+  s.add_dependency 'elasticsearch-persistence', '~> 7.0.0'
+  s.add_dependency 'elasticsearch-rails', '~> 7.0.0'
+  s.add_dependency 'fog-aws', '~> 3.5.2'
+  s.add_dependency 'font-awesome-sass', '~> 5.12.0'
+  s.add_dependency 'foundation-rails', '~> 6.6.1.0'
+  s.add_dependency 'google-api-client', '~> 0.37.1'
+  s.add_dependency 'heap', '~> 1'
+  s.add_dependency 'hiredis', '~> 0.6.3'
+  s.add_dependency 'httparty', '~> 0.18.0'
+  s.add_dependency 'jbuilder', '~> 2.10.0'
+  s.add_dependency 'jquery-rails', '~> 4.3.5'
+  s.add_dependency 'js-routes', '~> 1.4.9'
+  s.add_dependency 'lt-google-api', '~> 0.1.1'
+  s.add_dependency 'lt-lcms', '~> 0.2.0'
+  s.add_dependency 'migration_data', '~> 0.6.0'
+  s.add_dependency 'mini_magick', '~> 4.10.1'
+  s.add_dependency 'nested_form', '~> 0.3.2'
   s.add_dependency 'nikkou', '~> 0.0.5'
-  s.add_dependency 'nokogiri', '~> 1.10', '>= 1.10.4'
-  s.add_dependency 'oj', '3.10.8'
+  s.add_dependency 'nokogiri', '~> 1.10.8'
+  s.add_dependency 'oj', '~> 3.10.2'
   s.add_dependency 'oj_mimic_json', '~> 1.0.1'
-  s.add_dependency 'pandoc-ruby', '~> 2.0.1'
-  s.add_dependency 'pdfjs_viewer-rails', '~> 0.0.9'
-  s.add_dependency 'pg', '0.20'
-  s.add_dependency 'pg_search', '~> 2.1'
-  s.add_dependency 'postgres_ext', '~> 3.0'
-  s.add_dependency 'rack-mini-profiler', '~> 2'
-  s.add_dependency 'rails', '~> 4.2.11'
-  s.add_dependency 'rails-assets-classnames', '~> 2.2.3'
-  s.add_dependency 'rails-assets-es6-promise', '~> 3.1.2'
-  s.add_dependency 'rails-assets-eventemitter3', '~> 1.2.0'
-  s.add_dependency 'rails-assets-fetch', '~> 0.11.0'
-  s.add_dependency 'rails-assets-jstree', '~> 3.3.4'
-  s.add_dependency 'rails-assets-knockout', '~> 3.3.0'
-  s.add_dependency 'rails-assets-lodash', '~> 4.17.11'
-  s.add_dependency 'rails-assets-selectize', '~> 0.12.1'
-  s.add_dependency 'ransack', '~> 1.7.0'
-  s.add_dependency 'react-rails', '~> 2.6.0'
-  s.add_dependency 'readthis', '~> 2'
-  s.add_dependency 'redis', '< 4'
-  s.add_dependency 'resque', '~> 2'
-  s.add_dependency 'resque-scheduler', '~> 4.4'
-  s.add_dependency 'rest-client', '~> 2.1'
-  s.add_dependency 'ruby-progressbar', '~> 1.7', '>= 1.7.5'
+  s.add_dependency 'pandoc-ruby', '~> 2.0.2'
+  s.add_dependency 'pdfjs_viewer-rails', '~> 0.3.1'
+  s.add_dependency 'pg', '~> 1.2.2'
+  s.add_dependency 'pg_search', '~> 2.3.2'
+  s.add_dependency 'rack-mini-profiler', '~> 1.1.6'
+  s.add_dependency 'rails', '~> 5.2.4'
+  s.add_dependency 'rails-assets-classnames', '~> 2.2.5'
+  s.add_dependency 'rails-assets-es6-promise', '~> 4.2.4'
+  s.add_dependency 'rails-assets-eventemitter3', '~> 3.1.2'
+  s.add_dependency 'rails-assets-fetch', '~> 3.0.0'
+  s.add_dependency 'rails-assets-jstree', '~> 3.3.8'
+  s.add_dependency 'rails-assets-knockout', '~> 3.5.0'
+  s.add_dependency 'rails-assets-lodash', '~> 4.17.15'
+  s.add_dependency 'rails-assets-selectize', '~> 0.12.6'
+  s.add_dependency 'ransack', '~> 2.3.2'
+  s.add_dependency 'react-rails', '~> 2.6.1'
+  s.add_dependency 'redis', '~> 4.1.3'
+  s.add_dependency 'resque', '~> 2.0.0'
+  s.add_dependency 'resque-scheduler', '~> 4.4.0'
+  s.add_dependency 'rest-client', '~> 2.1.0'
+  s.add_dependency 'ruby-progressbar', '~> 1.10.1'
   s.add_dependency 'rubyzip', '~> 2'
-  s.add_dependency 'sanitize', '>= 5.1', '< 5.3'
-  s.add_dependency 'sass-rails', '~> 5.0'
-  s.add_dependency 'simple_form', '~> 3.5'
-  s.add_dependency 'staccato', '~> 0.4.7'
-  s.add_dependency 'thor', '0.19.1'
+  s.add_dependency 'sanitize', '~> 5.1.0'
+  s.add_dependency 'sass-rails', '~> 5.1.0'
+  s.add_dependency 'simple_form', '~> 5.0.2'
+  s.add_dependency 'staccato', '~> 0.5.3'
   s.add_dependency 'truncate_html', '~> 0.9.3'
-  s.add_dependency 'turbolinks', '~> 5.1.0'
-  s.add_dependency 'uglifier', '~> 3.0', '>= 3.0.4'
-  s.add_dependency 'validate_url', '~> 1.0'
+  s.add_dependency 'turbolinks', '~> 5.2.1'
+  s.add_dependency 'validate_url', '~> 1.0.8'
   s.add_dependency 'virtus', '~> 1.0.5'
-  s.add_dependency 'will_paginate', '~> 3.0.7'
-  s.add_dependency 'will_paginate-bootstrap', '~> 1'
+  s.add_dependency 'will_paginate', '~> 3.2.1'
+  s.add_dependency 'will_paginate-bootstrap', '~> 1.0.2'
 
-  s.add_development_dependency 'capybara-screenshot', '~> 1'
-  s.add_development_dependency 'database_cleaner', '~> 1'
+  s.add_development_dependency 'capybara', '~> 3.31'
+  s.add_development_dependency 'database_cleaner-active_record', '~> 1.8'
   s.add_development_dependency 'dotenv-rails', '~> 2.2'
   s.add_development_dependency 'email_spec', '~> 2.1'
   s.add_development_dependency 'factory_bot', '~> 5'
   s.add_development_dependency 'faker', '~> 2.1'
-  s.add_development_dependency 'guard-livereload', '~> 2.5', '>= 2.5.2'
-  s.add_development_dependency 'mailcatcher', '~> 0.7'
   s.add_development_dependency 'overcommit', '~> 0.49.1'
   s.add_development_dependency 'pry-byebug', '~> 3.7'
   s.add_development_dependency 'pry-rails', '~> 0.3.5'
-  s.add_development_dependency 'puma', '~> 4', '>= 4.3.5'
-  s.add_development_dependency 'quiet_assets', '~> 1.1'
-  s.add_development_dependency 'rack-livereload', '~> 0.3.16'
   s.add_development_dependency 'rspec-rails', '~> 3.8'
   s.add_development_dependency 'rubocop', '~> 0.59.2'
-  s.add_development_dependency 'safe_attributes', '~> 1.0.10'
-  s.add_development_dependency 'sdoc', '~> 0.4.0'
-  s.add_development_dependency 'seedbank', '~> 0.3'
-  s.add_development_dependency 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
+  s.add_development_dependency 'sdoc', '~> 1.1'
+  s.add_development_dependency 'selenium-webdriver', '~> 3.142'
   s.add_development_dependency 'shoulda-matchers', '~> 4.1'
   s.add_development_dependency 'spring', '~> 2.1'
-  s.add_development_dependency 'spring-commands-rspec', '~> 1'
+  s.add_development_dependency 'spring-commands-rspec', '~> 1.0'
   s.add_development_dependency 'traceroute', '~> 0.8'
-  s.add_development_dependency 'webpacker', '~> 4.0.6'
+  s.add_development_dependency 'webdrivers', '~> 4.0'
+  s.add_development_dependency 'webpacker', '~> 4.0'
 end

data/lib/doc_template/document.rb

@@ -2,7 +2,7 @@
 
 module DocTemplate
   class Document
-    MAX_PARSE_ITERATIONS = 300
+    MAX_PARSE_ITERATIONS = 100
 
     # Contains the list of tags for which no parts should be created
     TAGS_WITHOUT_PARTS = [
@@ -178,7 +178,7 @@ module DocTemplate
 
       parts << {
         anchor: parsed_tag.anchor.to_s,
-        content: parsed_tag.try(:without_squish?) ? sanitized_content : sanitized_content.squish,
+        content: sanitized_content.squish,
         context_type: @opts[:context_type],
         data: parsed_tag.tag_data,
         materials: parsed_tag.materials,

data/lib/doc_template/tables/activity.rb

@@ -10,9 +10,10 @@ module DocTemplate
 
       def parse(fragment, *args)
         template_type = args.extract_options![:template_type].presence || 'core'
+        path = ".//table/*/tr[1]/td//*[case_insensitive_equals(text(),'#{HEADER_LABEL}')]"
         idx = 0
         [].tap do |result|
-          fragment.xpath(xpath_meta_headers, XpathFunctions.new).each do |el|
+          fragment.xpath(path, XpathFunctions.new).each do |el|
             table = el.ancestors('table').first
             data = fetch table
 

data/lib/doc_template/tables/base.rb

@@ -132,10 +132,6 @@ module DocTemplate
           end
         end
       end
-
-      def xpath_meta_headers
-        ".//table/*/tr[1]/td[1][case_insensitive_equals(normalize-space(),'#{self.class::HEADER_LABEL}')]"
-      end
     end
   end
 end

data/lib/doc_template/tables/section.rb

@@ -9,7 +9,8 @@ module DocTemplate
       MATERIALS_KEY = 'section-materials'
 
       def parse(fragment, *args)
-        section_tables = fragment.xpath(xpath_meta_headers, XpathFunctions.new)
+        path = ".//table/*/tr[1]/td//*[case_insensitive_equals(text(),'#{HEADER_LABEL}')]"
+        section_tables = fragment.xpath(path, XpathFunctions.new)
 
         # # Allows to handle ELA as Math:: inject fake section
         return fake_section(fragment) if section_tables.empty? && args.extract_options![:force_inject]

data/lib/doc_template/tags/link_tag.rb

@@ -24,7 +24,7 @@ module DocTemplate
         label = text.present? ? "<b>#{text}</b>" : ''
         href = build_href(title, opts[:metadata])
 
-        "<a href=\"#{href}\" target=\"_blank\" title=\"#{title}\"><i class=\"fa fa-book\"></i> #{label}</a>"
+        "<a href=\"#{href}\" target=\"_blank\" title=\"#{title}\"><i class=\"fas fa-book\"></i> #{label}</a>"
       end
 
       def build_href(title, metadata)

data/lib/doc_template/xpath_functions.rb

@@ -3,9 +3,7 @@
 module DocTemplate
   class XpathFunctions
     def case_insensitive_equals(node_set, str_to_match)
-      return node_set.to_s.squish.casecmp(str_to_match).zero? if node_set.is_a?(String)
-
-      node_set.find_all { |node| node.to_s.squish.casecmp(str_to_match).zero? }
+      node_set.find_all { |node| node.to_s.casecmp(str_to_match).zero? }
     end
 
     def case_insensitive_contains(node_set, str_to_match)

data/lib/document_exporter/base.rb

@@ -50,11 +50,10 @@ module DocumentExporter
 
     def render_template(path, layout:)
       field = path.starts_with?('/') ? :file : :template
-      # Using backport of Rails 5 Renderer here
       Lcms::Engine::ApplicationController.render(
         field => path,
         layout: layout,
-        locals: { document: @document, options: @options }
+        assigns: { document: @document, options: @options }
       )
     end
 

data/lib/document_exporter/docx.rb

@@ -15,7 +15,6 @@ module DocumentExporter
     private
 
     def content
-      # Using backport of Rails 5 Renderer here
       @content ||= ApplicationController.render(
         layout: 'ld_docx',
         locals: { :@document => @document },

data/lib/generators/lcms/engine/install/install_generator.rb

@@ -13,13 +13,10 @@ module Lcms
         end
 
         def update_gemfile
-          # Rails-assets.org is needed to fetch required gems (rails-assets-*)
-          add_source 'https://rails-assets.org'
-
           # Required by lcms-engine because of unpublished gems are not automatically installed with the parent gem
           gem 'wicked_pdf', git: 'https://github.com/learningtapestry/wicked_pdf.git',
                             branch: 'puppeteer-support',
-                            ref: 'c807f6b4'
+                            ref: '964a090'
         end
       end
     end

data/lib/generators/lcms/engine/install/templates/config/lcms.yml

@@ -48,4 +48,4 @@ sanitizer: '::Lcms::Engine::HtmlSanitizer'
 # material_preview_job:
 
 queries:
-  document: 'AdminDocumentsQuery'
+  document: '::Lcms::Engine::AdminDocumentsQuery'

data/lib/lcms/engine/engine.rb

@@ -3,7 +3,6 @@
 require 'active_job'
 require 'acts-as-taggable-on'
 require 'active_model_serializers'
-require 'backport_new_renderer'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'closure_tree'
@@ -131,21 +130,6 @@ module Lcms
         )
       end
 
-      ENABLE_CACHING = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(
-        ENV.fetch('ENABLE_CACHING', true)
-      )
-
-      if ENABLE_CACHING
-        redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379')
-        config.cache_store = :readthis_store, {
-          expires_in: 1.hour.to_i,
-          namespace: 'unbounded',
-          redis: { url: redis_url, driver: :hiredis }
-        }
-      else
-        config.cache_store = :null_store
-      end
-
       # NOTE: Sample to customize the layout
       # config.to_prepare do
       #   Devise::SessionsController.layout "layout_for_sessions_controller"

data/lib/lcms/engine/migration.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'version'
+
 module Lcms
   module Engine
     if Rails::VERSION::MAJOR >= 5

data/lib/lcms/engine/version.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    VERSION = '0.1.4'
+    VERSION = '0.2.0'
     RAILS_5_VERSION = 5.2
   end
 end

data/lib/lt/lcms/metadata/context.rb

@@ -17,11 +17,11 @@ module Lt
           # Is used inside `#find_or_create_resource` method
           #
           def update_grades_level_position_for(grades)
-            update_level_position_for(grades) { |g| ::Lcms::Engine::Grades::GRADES.index(g.metadata['grade']) }
+            update_level_position_for(grades) { |m| ::Lcms::Engine::Grades::GRADES.index(m.metadata['grade']) }
           end
 
           #
-          # Fix level position for modules
+          # Fix level position for modules (guidebooks)
           # Is used inside `#find_or_create_resource` method
           #
           def update_modules_level_position_for(modules)
@@ -30,11 +30,11 @@ module Lt
           end
 
           #
-          # Fix level position for units
+          # Fix level position for units (sections)
           # Is used inside `#find_or_create_resource` method
           #
           def update_units_level_position_for(units)
-            update_level_position_for(units) { |u| u.metadata['unit'][NUM_RE].to_i }
+            update_level_position_for(units) { |m| m.metadata['unit'][NUM_RE].to_i }
           end
 
           #
@@ -103,6 +103,8 @@ module Lt
             else
               set_lesson_position(parent, resource)
             end
+
+            parent = resource
           end
 
           update resource
@@ -290,7 +292,7 @@ module Lt
         def set_lesson_position(parent, resource)
           next_lesson = parent.children.detect do |r|
             # first lesson with a bigger lesson num
-            r.metadata['lesson'].to_s[NUM_RE].to_i > context[:lesson].to_s[NUM_RE].to_i
+            r.lesson_number > context[:lesson].to_i
           end
           next_lesson ? next_lesson.prepend_sibling(resource) : resource.save!
         end

data/spec/controllers/admin/admin_controller_spec.rb

@@ -10,7 +10,7 @@ describe Lcms::Engine::Admin::AdminController do
 
     context 'with host redirect' do
       it 'builds correct path' do
-        expect(subject).to eq "/lcms-engine/admin?#{args.to_param}"
+        expect(subject).to eq "/admin?#{args.to_param}"
       end
     end
 

data/spec/controllers/admin/association_picker_controller_spec.rb

@@ -13,8 +13,8 @@ describe Lcms::Engine::Admin::AssociationPickerController do
   describe '#index' do
     ASSOCIATIONS.each do |assoc|
       it "list #{assoc} association items" do
-        get :index, association: assoc, format: :json
-        expect(response).to be_success
+        get :index, params: { association: assoc, format: :json }
+        expect(response).to be_successful
       end
     end
   end

data/spec/controllers/admin/curriculums_controller_spec.rb

@@ -10,7 +10,6 @@ describe Lcms::Engine::Admin::CurriculumsController do
   describe '#edit' do
     subject { get :edit }
 
-    it { is_expected.to be_success }
-    it { is_expected.to render_template :edit }
+    it { is_expected.to be_successful }
   end
 end

data/spec/controllers/admin/documents_controller_spec.rb

@@ -8,15 +8,18 @@ describe Lcms::Engine::Admin::DocumentsController do
   before { sign_in user }
 
   describe '#create' do
+    let(:credentials) { double }
     let(:document) { create :document }
     let(:form) { instance_double('Lcms::Engine::DocumentForm', document: document, save: valid) }
-    let(:link) { 'link' }
-    let(:params) { { link: link, link_fs: 'link_fs', reimport: '1' } }
+    let(:params) { { link: 'link', link_fs: 'link_fs', reimport: '1' } }
     let(:valid) { true }
 
-    before { allow(Lcms::Engine::DocumentForm).to receive(:new).and_return(form) }
+    before do
+      # allow(controller).to receive(:google_credentials).and_return(credentials)
+      allow(Lcms::Engine::DocumentForm).to receive(:new).and_return(form)
+    end
 
-    subject { post :create, document_form: params }
+    subject { post :create, params: { document_form: params } }
 
     it 'creates DocumentForm object' do
       expect(Lcms::Engine::DocumentForm).to receive(:new).with(params)
@@ -28,51 +31,18 @@ describe Lcms::Engine::Admin::DocumentsController do
       expect(response).to redirect_to Lcms::Engine::Admin::AdminController.document_path(document)
     end
 
-    context 'when there is an error' do
+    # TODO: Rails upgrade - move to system spec
+    xcontext 'when there is an error' do
       let(:valid) { false }
 
       it { is_expected.to render_template :new }
     end
-
-    context 'when a link to Google Documents folder passed in' do
-      let(:credentials) { double }
-      let(:file_ids) { ['file_id'] }
-      let(:folder_id) { 'folder_id' }
-      let(:link) { 'https://drive.google.com/drive/u/x/folders/fkjsdhfjkshfkjsdhf' }
-
-      before do
-        allow(controller).to receive(:google_credentials).and_return(credentials)
-        allow(::Lt::Google::Api::Drive).to \
-          receive(:folder_id_for).with(link).and_return(folder_id)
-        allow(::Lt::Google::Api::Drive).to \
-          receive_message_chain(:new, :list_file_ids_in, :map).and_return(file_ids)
-      end
-
-      it 'calls batch reimport' do
-        expect(Lcms::Engine::DocumentGenerator).to \
-          receive_message_chain(:document_parse_job, :perform_later).and_return(OpenStruct.new(job_id: 0))
-        subject
-      end
-
-      it 'renders import template' do
-        expect(subject).to render_template :import
-      end
-
-      context 'and when there are no documents' do
-        let(:file_ids) { [] }
-
-        it 'shows the message' do
-          subject
-          expect(flash[:alert]).to eq I18n.t('lcms.engine.admin.documents.create.empty_folder')
-        end
-      end
-    end
   end
 
   describe '#destroy' do
     let!(:document) { create :document }
 
-    subject { delete :destroy, id: document.id }
+    subject { delete :destroy, params: { id: document.id } }
 
     it 'deletes the document' do
       expect { subject }.to change(Lcms::Engine::Document, :count).by(-1)
@@ -87,6 +57,7 @@ describe Lcms::Engine::Admin::DocumentsController do
       subject
     end
 
-    it { is_expected.to render_template :new }
+    # TODO: Rails upgrade - move to system spec
+    xit { is_expected.to render_template :new }
   end
 end