Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5a592a4

Browse files
committedDec 1, 2021
Fix Admin panel routes
Update calls to the routes to use _mount point_ - that way we can avoid the errors when engine is used in mixed setup with host application. And some parts of the Admin panel is overridden. Also disable Sprocket concurency (see rails/sprockets#581)
1 parent a5422d0 commit 5a592a4

33 files changed

+85
-67
lines changed
 

‎app/controllers/lcms/engine/admin/access_codes_controller.rb

+8-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@ class AccessCodesController < AdminController
99
def create
1010
@access_code = AccessCode.new(permitted_params)
1111
if @access_code.save
12-
redirect_to({ action: :index }, notice: t('.success'))
12+
redirect_to lcms_engine.admin_access_codes_path, notice: t('.success')
1313
else
1414
render :new
1515
end
1616
end
1717

1818
def destroy
1919
@access_code.destroy
20-
redirect_to({ action: :index }, notice: t('.success'))
20+
redirect_to lcms_engine.admin_access_codes_path, notice: t('.success')
21+
end
22+
23+
def edit
24+
@url = lcms_engine.admin_access_code_path(@access_code)
2125
end
2226

2327
def index
@@ -30,8 +34,9 @@ def new
3034

3135
def update
3236
if @access_code.update(permitted_params)
33-
redirect_to({ action: :index }, notice: t('.success'))
37+
redirect_to lcms_engine.admin_access_codes_path, notice: t('.success')
3438
else
39+
@url = lcms_engine.admin_access_code_path(@access_code)
3540
render :edit
3641
end
3742
end

‎app/controllers/lcms/engine/admin/curriculums_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def edit
1111
def update
1212
@form = CurriculumForm.new(params[:curriculum])
1313
if @form.save
14-
redirect_to admin_path, notice: t('.success')
14+
redirect_to lcms_engine.root_path, notice: t('.success')
1515
else
1616
@curriculum = CurriculumPresenter.new
1717
render :edit, alert: t('.error')

‎app/controllers/lcms/engine/admin/resource_bulk_edits_controller.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ def new
1010
if @resources.any?
1111
@resource = BulkEditResourcesService.new(@resources).init_sample
1212
else
13-
redirect_to :admin_resources, alert: t('.no_resources')
13+
redirect_to lcms_engine.admin_resources_path, alert: t('.no_resources')
1414
end
1515
end
1616

1717
def create
1818
BulkEditResourcesService.new(@resources, resource_params).edit!
1919
resources_count_msg = t(:resources_count, count: @resources.count)
2020
notice = t('.success', count: @resources.count, resources_count: resources_count_msg)
21-
redirect_to :admin_resources, notice: notice
21+
redirect_to lcms_engine.admin_resources_path, notice: notice
2222
end
2323

2424
private

‎app/controllers/lcms/engine/admin/resources_controller.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def create
3030

3131
if @resource.save
3232
create_tags
33-
redirect_to :admin_resources, notice: t('.success', resource_id: @resource.id)
33+
redirect_to lcms_engine.admin_resources_path, notice: t('.success', resource_id: @resource.id)
3434
else
3535
render :new
3636
end
@@ -50,17 +50,17 @@ def export_to_lti_cc
5050
end
5151

5252
def bundle
53-
return redirect_to :admin_resources, notice: t('.fail') unless can_bundle?(@resource)
53+
return redirect_to lcms_engine.admin_resources_path, notice: t('.fail') unless can_bundle?(@resource)
5454

5555
# see settings loaded via `lcms.yml`
5656
generator = DocTemplate.config.dig('bundles', @resource.curriculum_type).constantize
5757
generator.perform(@resource)
58-
redirect_to :admin_resources, notice: t('.success')
58+
redirect_to lcms_engine.admin_resources_path, notice: t('.success')
5959
end
6060

6161
def update
6262
unless Settings[:editing_enabled]
63-
return redirect_to(:admin_resources, alert: t('admin.common.editing_disabled'))
63+
return redirect_to(lcms_engine.admin_resources_path, alert: t('admin.common.editing_disabled'))
6464
end
6565

6666
create_tags
@@ -70,15 +70,15 @@ def update
7070
end
7171

7272
if @resource.update(resource_params)
73-
redirect_to :admin_resources, notice: t('.success', resource_id: @resource.id)
73+
redirect_to lcms_engine.admin_resources_path, notice: t('.success', resource_id: @resource.id)
7474
else
7575
render :edit
7676
end
7777
end
7878

7979
def destroy
8080
@resource.destroy
81-
redirect_to :admin_resources, notice: t('.success', resource_id: @resource.id)
81+
redirect_to lcms_engine.admin_resources_path, notice: t('.success', resource_id: @resource.id)
8282
end
8383

8484
protected

‎app/controllers/lcms/engine/admin/settings_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class SettingsController < AdminController
77
def toggle_editing_enabled
88
Settings[:editing_enabled] = !Settings[:editing_enabled]
99
notice = Settings[:editing_enabled] ? t('.enabled') : t('.disabled')
10-
redirect_to :admin_resources, notice: notice
10+
redirect_to lcms_engine.admin_resources_path, notice: notice
1111
end
1212
end
1313
end

‎app/controllers/lcms/engine/admin/standards_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def index
2020

2121
def update
2222
if @standard.update(standard_params)
23-
redirect_to admin_standards_path, notice: t('.success')
23+
redirect_to lcms_engine.admin_standards_path, notice: t('.success')
2424
else
2525
render :edit
2626
end

‎app/controllers/lcms/engine/admin/users_controller.rb

+8-5
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,33 @@ def create
2121
@user.generate_password
2222
if @user.save
2323
@user.send_reset_password_instructions
24-
redirect_to(:admin_users, notice: t('.success', user: @user.email))
24+
redirect_to lcms_engine.admin_users_path, notice: t('.success', user: @user.email)
2525
else
2626
render :new
2727
end
2828
end
2929

30-
def edit; end
30+
def edit
31+
@url = lcms_engine.admin_user_path(@user)
32+
end
3133

3234
def update
3335
if @user.update(user_params)
34-
redirect_to edit_admin_user_path(@user), notice: t('.success', user: @user.email)
36+
redirect_to lcms_engine.admin_users_path, notice: t('.success', user: @user.email)
3537
else
38+
@url = lcms_engine.admin_user_path(@user)
3639
render :edit
3740
end
3841
end
3942

4043
def destroy
4144
@user.destroy
42-
redirect_to :admin_users, notice: t('.success')
45+
redirect_to lcms_engine.admin_users_path, notice: t('.success')
4346
end
4447

4548
def reset_password
4649
@user.send_reset_password_instructions
47-
redirect_to :admin_users, notice: t('.success')
50+
redirect_to lcms_engine.admin_users_path, notice: t('.success')
4851
end
4952

5053
private

‎app/controllers/lcms/engine/resources_controller.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ def show
77
@resource = find_resource
88

99
# redirect to document if resource has it (#161)
10-
return redirect_to document_path(@resource.document) if @resource.document?
10+
return redirect_to dynamic_document_path(@resource.document) if @resource.document?
1111

1212
# redirect grade and module to explore_curriculum (#122)
13-
return redirect_to explore_curriculum_index_path(p: @resource.slug, e: 1) if grade_or_module?
13+
return redirect_to lcms_engine.explore_curriculum_index_path(p: @resource.slug, e: 1) if grade_or_module?
1414

1515
# redirect to the path with slug if we are using just the id
16-
return redirect_to show_with_slug_path(@resource.slug), status: 301 if using_id?
16+
return redirect_to lcms_engine.show_with_slug_path(@resource.slug), status: 301 if using_id?
1717

1818
@related_instructions = related_instructions
1919
@props = CurriculumMap.new(@resource).props
@@ -27,14 +27,14 @@ def related_instruction
2727

2828
def media
2929
resource = Resource.find(params[:id])
30-
return redirect_to resource_path(resource) unless resource.media?
30+
return redirect_to lcms_engine.resource_path(resource) unless resource.media?
3131

3232
@resource = MediaPresenter.new(resource)
3333
end
3434

3535
def generic
3636
resource = Resource.find(params[:id])
37-
return redirect_to resource_path(resource) unless resource.generic?
37+
return redirect_to lcms_engine.resource_path(resource) unless resource.generic?
3838

3939
@resource = GenericPresenter.new(resource)
4040
end

‎app/views/lcms/engine/admin/access_codes/_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for [:admin, @access_code], html: { id: 'access_code_form' } do |f| %>
1+
<%= simple_form_for @access_code, url: @url.presence || lcms_engine.admin_access_codes_path, html: { id: 'access_code_form' } do |f| %>
22
<%= f.input :code %>
33
<%= f.input :active %>
44
<%= f.button :submit, t('ui.save'), name: nil %>

‎app/views/lcms/engine/admin/access_codes/index.html.erb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class=o-page>
22
<div class=clearfix>
33
<div class=pull-right>
4-
<%= link_to t('.new_access_code'), :new_admin_access_code, class: 'button success', 'data-turbolinks' => false %>
4+
<%= link_to t('.new_access_code'), lcms_engine.new_admin_access_code_path, class: 'button success', 'data-turbolinks' => false %>
55
</div>
66
</div>
77

@@ -19,10 +19,10 @@
1919
<% @access_codes.each do |access_code| %>
2020
<% cache access_code do %>
2121
<tr id="access_code_<%= access_code.id %>">
22-
<td><%= link_to access_code.code, edit_admin_access_code_path(access_code) %>
22+
<td><%= link_to access_code.code, lcms_engine.edit_admin_access_code_path(access_code) %>
2323
<td><%= access_code.active ? 'YES' : 'NO' %>
2424
<td>
25-
<%= button_to t('ui.delete'), admin_access_code_path(access_code), class: 'button alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
25+
<%= button_to t('ui.delete'), lcms_engine.admin_access_code_path(access_code), class: 'button alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
2626
</td>
2727
</tr>
2828
<% end %>

‎app/views/lcms/engine/admin/batch_reimports/_search_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for :query, url: :admin_batch_reimport, html: { class: 'form-inline well o-admin-lessons-search', method: :post } do |f| %>
1+
<%= simple_form_for :query, url: lcms_engine.admin_batch_reimport_path, html: { class: 'form-inline well o-admin-lessons-search', method: :post } do |f| %>
22

33
<div class="row align-bottom align-justify">
44
<button class="button o-admin-search-subject float-right" type="button" data-toggle="subject">Select Subject</button>

‎app/views/lcms/engine/admin/documents/_search_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for :query, url: :admin_documents, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
1+
<%= simple_form_for :query, url: lcms_engine.admin_documents_path, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
22

33
<div class='row align-bottom align-justify'>
44
<button class="button o-admin-search-subject float-right" type="button" data-toggle="lesson-subject">Select Subject</button>

‎app/views/lcms/engine/admin/documents/index.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
path: delete_selected_admin_documents_path(query: @query_params),
2525
btn_style: 'alert'} %>
2626

27-
<%= link_to t('.new_lesson'), :new_admin_document, class: 'button primary' %>
27+
<%= link_to t('.new_lesson'), lcms_engine.new_admin_document_path, class: 'button primary' %>
2828
</div>
2929
<table class="lessons-table table">
3030
<tr>

‎app/views/lcms/engine/admin/materials/_search_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for :query, url: :admin_materials, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
1+
<%= simple_form_for :query, url: lcms_engine.admin_materials_path, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
22

33
<div class="row align-bottom align-justify">
44
<%= f.input :search_term, label: 'Identifier', required: false,

‎app/views/lcms/engine/admin/materials/index.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
path: delete_selected_admin_materials_path(query: @query_params),
2525
btn_style: 'alert'} %>
2626
<%# link_to t('.new_material_pdf'), new_admin_material_path(source_type: 'pdf'), class: 'button primary' %>
27-
<%= link_to t('.new_material'), :new_admin_material, class: 'button primary' %>
27+
<%= link_to t('.new_material'), lcms_engine.new_admin_material_path, class: 'button primary' %>
2828
</div>
2929
<div class="materials-table materials-table__wrapper">
3030
<table class="table u-text--centered">

‎app/views/lcms/engine/admin/resource_bulk_edits/new.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class=o-page>
22
<h2 class=text-center><%= t('.page_title') %></h2>
33

4-
<%= simple_form_for @resource, url: :admin_resource_bulk_edits do |f| %>
4+
<%= simple_form_for @resource, url: lcms_engine.admin_resource_bulk_edits_path do |f| %>
55

66
<% @resources.each do |resource| %>
77
<%= hidden_field_tag 'ids[]', resource.id %>

‎app/views/lcms/engine/admin/resources/_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<% url = @resource.new_record? ? :admin_resources : admin_resource_path(@resource) %>
1+
<% url = @resource.new_record? ? lcms_engine.admin_resources_path : lcms_engine.admin_resource_path(@resource) %>
22

33
<%= simple_nested_form_for @resource, url: url, html: { id: 'resource_form' } do |f| %>
44
<div class="large-10 columns">

‎app/views/lcms/engine/admin/resources/_search_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for @query, url: :admin_resources, html: { class: 'form-inline well admin-resource-search', method: :get } do |f| %>
1+
<%= simple_form_for @query, url: lcms_engine.admin_resources_path, html: { class: 'form-inline well admin-resource-search', method: :get } do |f| %>
22

33
<div class='row align-justify'>
44
<%= f.input :grades, as: :select, collection: Lcms::Engine::Grades.grades, input_html: { class: 'selectize resource-search-select', multiple: true }, label: t('.grades'), label_method: :humanize, required: false, wrapper_html: { class: 'resource-search-wrap' } %>

‎app/views/lcms/engine/admin/shared/_header.html.erb

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,36 @@
1313
<div class="o-top-bar__item c-header__menu">
1414
<ul class="dropdown menu" data-dropdown-menu>
1515
<li class="c-header__link">
16-
<%= link_to t('lcms.engine.admin.nav.curriculum'), edit_admin_curriculum_path %>
16+
<%= link_to t('lcms.engine.admin.nav.curriculum'), lcms_engine.edit_admin_curriculum_path %>
1717
</li>
1818

1919
<li class="dropdown c-header__link">
20-
<%= link_to t('lcms.engine.admin.nav.resources'), admin_resources_path %>
20+
<%= link_to t('lcms.engine.admin.nav.resources'), lcms_engine.admin_resources_path %>
2121
<ul class="menu vertical">
22-
<%= nav_link t('lcms.engine.admin.nav.resources'), admin_resources_path %>
23-
<%= nav_link t('lcms.engine.admin.nav.add_resource'), new_admin_resource_path %>
22+
<%= nav_link t('lcms.engine.admin.nav.resources'), lcms_engine.admin_resources_path %>
23+
<%= nav_link t('lcms.engine.admin.nav.add_resource'), lcms_engine.new_admin_resource_path %>
2424
<%#= nav_link t('lcms.engine.admin.nav.sketch_compilation', version: 'v1'), new_admin_sketch_compiler_path(:v1) %>
2525
<%#= nav_link t('lcms.engine.admin.nav.sketch_compilation', version: 'v2'), new_admin_sketch_compiler_path(:v2) %>
26-
<%= nav_link t('lcms.engine.admin.nav.lessons'), admin_documents_path %>
27-
<%= nav_link t('lcms.engine.admin.nav.materials'), admin_materials_path %>
28-
<%= nav_link t('lcms.engine.admin.nav.batch_reimport'), new_admin_batch_reimport_path %>
26+
<%= nav_link t('lcms.engine.admin.nav.lessons'), lcms_engine.admin_documents_path %>
27+
<%= nav_link t('lcms.engine.admin.nav.materials'), lcms_engine.admin_materials_path %>
28+
<%= nav_link t('lcms.engine.admin.nav.batch_reimport'), lcms_engine.new_admin_batch_reimport_path %>
2929
</ul>
3030
</li>
3131

3232
<li class="c-header__link">
33-
<%= link_to t('lcms.engine.admin.nav.standards'), admin_standards_path %>
33+
<%= link_to t('lcms.engine.admin.nav.standards'), lcms_engine.admin_standards_path %>
3434
</li>
3535

3636
<li class="dropdown c-header__link">
37-
<%= link_to t('lcms.engine.admin.nav.users'), admin_users_path %>
37+
<%= link_to t('lcms.engine.admin.nav.users'), lcms_engine.admin_users_path %>
3838
<ul class="menu vertical">
39-
<%= nav_link t('lcms.engine.admin.nav.users'), admin_users_path %>
40-
<%= nav_link t('lcms.engine.admin.nav.access_codes'), admin_access_codes_path %>
39+
<%= nav_link t('lcms.engine.admin.nav.users'), lcms_engine.admin_users_path %>
40+
<%= nav_link t('lcms.engine.admin.nav.access_codes'), lcms_engine.admin_access_codes_path %>
4141
</ul>
4242
</li>
4343

4444
<li class="c-header__link">
45-
<%= link_to t('lcms.engine.admin.nav.sign_out'), destroy_user_session_path %>
45+
<%= link_to t('lcms.engine.admin.nav.sign_out'), lcms_engine.destroy_user_session_path %>
4646
</li>
4747
</ul>
4848
</div>

‎app/views/lcms/engine/admin/standards/_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for @standard, as: :standard, url: admin_standard_path(@standard), html: { class: 'o-standard-form' } do |f| %>
1+
<%= simple_form_for @standard, as: :standard, url: lcms_engine.admin_standard_path(@standard), html: { class: 'o-standard-form' } do |f| %>
22

33
<div class="row o-admin-standard-readonly">
44
<label>Name: </label>

‎app/views/lcms/engine/admin/standards/_search_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for :query, url: :admin_standards, html: { class: 'form-inline well o-admin-standards-search', method: :get } do |f| %>
1+
<%= simple_form_for :query, url: lcms_engine.admin_standards_path, html: { class: 'form-inline well o-admin-standards-search', method: :get } do |f| %>
22

33
<div class='row align-bottom align-justify'>
44
<%= f.input :name, label: 'Name', required: false, wrapper_html: { class: 'resource-search-title' } %>

‎app/views/lcms/engine/admin/users/_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for [:admin, @user], html: { id: 'user_form' } do |f| %>
1+
<%= simple_form_for @user, url: @url.presence || lcms_engine.admin_users_path, html: { id: 'user_form' } do |f| %>
22
<%= f.input :id, disabled: true %>
33
<%= f.input :name %>
44
<%= f.input :email %>

‎app/views/lcms/engine/admin/users/_search_form.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= simple_form_for :query, url: :admin_users, html: { class: 'form-inline well o-admin-users-search', method: :get } do |f| %>
1+
<%= simple_form_for :query, url: lcms_engine.admin_users_path, html: { class: 'form-inline well o-admin-users-search', method: :get } do |f| %>
22

33
<div class='row align-bottom align-justify'>
44
<%= f.input :email, label: false, required: false, placeholder: 'Search by E-mail', wrapper_html: { class: 'o-admin-search-term' } %>

‎app/views/lcms/engine/admin/users/index.html.erb

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="row">
99
<div class="flex-pull-right">
10-
<%= link_to t('.new_user'), :new_admin_user, class: 'button success' %>
10+
<%= link_to t('.new_user'), lcms_engine.new_admin_user_path, class: 'button success' %>
1111
</div>
1212
<table class="table">
1313
<tr>
@@ -27,17 +27,17 @@
2727
<% @users.each do |user| %>
2828
<% cache user do %>
2929
<tr id="user_<%= user.id %>">
30-
<td><%= link_to user.id, edit_admin_user_path(user) %>
31-
<td><%= link_to user.survey&.fetch('first_name', nil) || user.name, edit_admin_user_path(user) %>
30+
<td><%= link_to user.id, lcms_engine.edit_admin_user_path(user) %>
31+
<td><%= link_to user.survey&.fetch('first_name', nil) || user.name, lcms_engine.edit_admin_user_path(user) %>
3232
<td><%= raw user.survey&.fetch('last_name', nil) %>
3333
<td><%= user.email %>
3434
<td><%= user.role %>
3535
<td><%= user.access_code.presence || '-' %>
3636
<td><%= user.confirmed? ? 'YES' : 'NO' %>
3737
<td class="u-txt--small"><%= user.created_at.to_s %>
38-
<td><%= link_to content_tag(:i, nil, class: 'fas fa-pencil-alt').html_safe, edit_admin_user_path(user), class: 'button small primary' %>
39-
<td><%= button_to t('.reset_password_btn'), reset_password_admin_user_path(user), class: 'button small', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
40-
<td><%= button_to t('ui.delete'), admin_user_path(user), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %></td>
38+
<td><%= link_to content_tag(:i, nil, class: 'fas fa-pencil-alt').html_safe, lcms_engine.edit_admin_user_path(user), class: 'button small primary' %>
39+
<td><%= button_to t('.reset_password_btn'), lcms_engine.reset_password_admin_user_path(user), class: 'button small', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
40+
<td><%= button_to t('ui.delete'), lcms_engine.admin_user_path(user), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %></td>
4141
</tr>
4242
<% end %>
4343
<% end %>

‎spec/controllers/admin/resource_bulk_edit_controller_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
grades = resources.flat_map { |r| r.grades.list }
2323
expect(grades).to_not include('grade 11')
2424
post :create, params: { ids: ids, resource: { grades: ['grade 11'] } }
25-
expect(response).to redirect_to(:admin_resources)
25+
expect(response).to redirect_to(lcms_engine(admin_resources_path))
2626
resources.each do |r|
2727
expect(r.reload.grades.list).to include('grade 11')
2828
end

‎spec/controllers/admin/resources_controller_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
subject { post :update, params: { id: resource.to_param, resource: params } }
2828

2929
context 'with valid params' do
30-
it { is_expected.to redirect_to admin_resources_path }
30+
it { is_expected.to redirect_to lcms_engine(admin_resources_path) }
3131

3232
it 'passes notice' do
3333
subject

‎spec/controllers/admin/settings_controller_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
expect(Lcms::Engine::Settings[:editing_enabled]).to be true
1212
patch :toggle_editing_enabled
1313
expect(Lcms::Engine::Settings[:editing_enabled]).to be false
14-
expect(response).to redirect_to(:admin_resources)
14+
expect(response).to redirect_to(lcms_engine(admin_resources_path))
1515
end
1616
end

‎spec/controllers/admin/standards_controller_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
subject { post :update, params: { id: standard.to_param, standard: params } }
6161

6262
context 'with valid params' do
63-
it { is_expected.to redirect_to admin_standards_path }
63+
it { is_expected.to redirect_to lcms_engine(admin_standards_path) }
6464

6565
it 'passes notice' do
6666
subject

‎spec/controllers/admin/welcome_controller_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
describe 'requires admin user' do
99
before { get :index }
10-
it { expect(response).to redirect_to new_user_session_path }
10+
it { expect(response).to redirect_to lcms_engine(new_user_session_path) }
1111
end
1212

1313
describe 'allow admin' do

‎spec/controllers/resources_controller_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@
4949
context 'with id' do
5050
before { get :show, id: resource.id }
5151

52-
it { expect(response).to redirect_to("/#{resource.slug}") }
52+
it { expect(response).to redirect_to("/lcms-engine#{resource.slug}") }
5353
end
5454

5555
context 'grade' do
5656
let(:resource) { create(:resource, :grade) }
5757
before { get :show, slug: resource.slug }
58-
it { expect(response).to redirect_to explore_curriculum_index_path(p: resource.slug, e: 1) }
58+
it { expect(response).to redirect_to lcms_engine(explore_curriculum_index_path(p: resource.slug, e: 1)) }
5959
end
6060

6161
context 'module' do
6262
let(:resource) { create(:resource, :module) }
6363
before { get :show, slug: resource.slug }
64-
it { expect(response).to redirect_to explore_curriculum_index_path(p: resource.slug, e: 1) }
64+
it { expect(response).to redirect_to lcms_engine(explore_curriculum_index_path(p: resource.slug, e: 1)) }
6565
end
6666
end
6767
end

‎spec/dummy/config/initializers/assets.rb

+6
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@
1414
# application.js, application.css, and all non-JS/CSS in the app/assets
1515
# folder are already added.
1616
# Rails.application.config.assets.precompile += %w( admin.js admin.css )
17+
18+
# To prevent Sass errors
19+
# See https://github.com/rails/sprockets/issues/581
20+
Rails.application.config.assets.configure do |env|
21+
env.export_concurrent = false
22+
end

‎spec/features/admin/users_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
click_button 'Save'
5858

5959
user.reload
60-
expect(current_path).to eq lcms_engine.edit_admin_user_path(user.id)
60+
expect(current_path).to eq lcms_engine.admin_users_path
6161
expect(page.find('.callout.success').text).to include('saved successfully')
6262
expect(user.email).to eq "unbounded@#{domain}"
6363
expect(user.unconfirmed_email).to eq "joe@#{domain}"

‎spec/support/routes.rb

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ module ControllerRoutes
99
included do
1010
routes { ::Lcms::Engine::Engine.routes }
1111
end
12+
13+
def lcms_engine(path)
14+
"/lcms-engine#{path}"
15+
end
1216
end
1317
end
1418
end

0 commit comments

Comments
 (0)
Please sign in to comment.