🚧 fixes circleci

.circleci/config.yml

@@ -58,7 +58,7 @@ save-assets-cache: &save-assets-cache
     key: *assets-cache-key
     paths:
       - public/assets
-      - public/packs-test
+      - public/packs
       - tmp/cache/assets
 
 restore-assets-cache: &restore-assets-cache
@@ -509,15 +509,14 @@ jobs:
       - *use-example-config-files
       - run:
           name: Precompile assets
-          command: bundle exec rake assets:precompile:test
+          command: bundle exec rake assets:precompile
           environment:
             RAILS_GROUPS: assets
       - *save-assets-cache
       - persist_to_workspace:
           root: .
           paths:
             - ./public/packs
-            - ./public/packs-test
             - ./public/assets
             - ./config/*.yml
       - notify_failure

.dockerignore

@@ -56,7 +56,6 @@ config/*.sphinx.conf
 public/assets
 public/system
 public/packs
-public/packs-tests
 openshift/system/*file
 openshift/system/Dockerfile*
 openshift/system/*.yml

.gitignore

@@ -129,7 +129,6 @@ package-lock.json
 
 # Webpack
 /public/packs
-/public/packs-test
 /node_modules
 /yarn-error.log
 yarn-debug.log*

app/helpers/webpack_helper.rb

@@ -1,5 +1,5 @@
 # rubocop:disable Rails/HelperInstanceVariable
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module WebpackHelper
   def load_webpack_manifest
@@ -17,13 +17,16 @@ def webpack_manifest
 
   ##
   # Returns a string of HTML script and style tags, containing all chunks of one or more +packs+.
+  # Chunks generated from ".ts" packs are located under the entrypoint with extension.
+  # Chunks generated from ".scss" packs are located under the entrypoint without extension.
   #
   # +packs+ is a list of pack names, without extension (.ts, .js).
   #
   # FIXME: the entrypoints in manifest should not have extension .ts
   #
   # A RuntimeError is raised if one pack is not found in the manifest, possibly pointing out a typo.
   def javascript_packs_with_chunks_tag(*packs) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+    raise RuntimeError
     @packs ||= []
     tags = ''
 
@@ -41,13 +44,13 @@ def javascript_packs_with_chunks_tag(*packs) # rubocop:disable Metrics/AbcSize,
       if (js = assets['js'])
         new_js_assets = js - @packs
         @packs.concat(new_js_assets)
-        tags += javascript_include_tag(*new_js_assets, defer: false)
+        tags.concat(javascript_include_tag(*new_js_assets, defer: false), "\n")
       end
 
       if (css = assets['css']) # rubocop:disable Style/Next
         new_css_assets = css - @packs
         @packs.concat(new_css_assets)
-        tags += stylesheet_link_tag(*new_css_assets, defer: false)
+        tags.concat(stylesheet_link_tag(*new_css_assets, defer: false))
       end
     end
 
@@ -56,6 +59,7 @@ def javascript_packs_with_chunks_tag(*packs) # rubocop:disable Metrics/AbcSize,
 
   ##
   # Returns a string of HTML style tags, containing all CSS chunks of one or more +packs+.
+  # Chunks generated from ".scss" packs are located under the entrypoint without extension.
   #
   # +packs+ is a list of pack names, without extension.
   #

lib/developer_portal/lib/liquid/filters/rails_helpers.rb

@@ -51,6 +51,7 @@ def javascript_include_tag(name, options = {})
         js = RailsHelpers.replace_googleapis(name)
         case
         when THREESCALE_WEBPACK_PACKS.include?(name) # TODO: This is an intermediate step in order to tackle webpack assets in dev portal. A final solution might be needed easing the update of templates/assets.
+          binding.pry
           active_docs_proxy(name) + view.javascript_packs_with_chunks_tag(name.chomp('.js'))
         when js != name || THREESCALE_JAVASCRIPTS.include?(js)
           active_docs_proxy(js) + view.javascript_include_tag(js)

test/unit/helpers/webpack_helper_test.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class WebpackHelperTest < ActionView::TestCase
+  include WebpackHelper
+
+  test 'unknown pack raise an error' do
+    assert_raise(RuntimeError) do
+      javascript_packs_with_chunks_tag('unknown')
+    end
+
+    assert_raise(RuntimeError) do
+      stylesheet_packs_chunks_tag('unknown')
+    end
+  end
+
+  test 'javascript_packs_with_chunks_tag' do
+    tags = javascript_packs_with_chunks_tag('application')
+
+    assert_equal 6, tags.lines.size
+  end
+
+  test 'stylesheet_packs_chunks_tag' do
+    tags = stylesheet_packs_chunks_tag('application')
+
+    assert_equal 1, tags.lines.size
+  end
+
+  private
+
+  def webpack_manifest # rubocop:disable Metrics/MethodLength
+    JSON.parse({
+      entrypoints: {
+        application: {
+          assets: {
+            js: [
+              'packs/js/application-1.js',
+              'packs/js/application-2.js',
+            ],
+            css: [
+              'packs/css/application-1.css',
+            ]
+          }
+        },
+        'application.ts': {
+          assets: {
+            js: [
+              'packs/js/application.ts-1.js',
+            ],
+            css: [
+              'packs/css/application.ts-1.css',
+              'packs/css/application.ts-2.css',
+            ]
+          }
+        }
+      }
+    }.to_json)
+  end
+end

test/unit/liquid/filters/rails_helpers_test.rb

@@ -10,7 +10,7 @@ def setup
 
   test 'javascript_include_tag' do
     @context.registers[:controller] = ApplicationController.new
-    WebpackHelper.stubs(:javascript_packs_with_chunks_tag).with('stats', type: :javascript).returns('/packs/stats.js') # TODO: FIXME
+    WebpackHelper.expects(:javascript_packs_with_chunks_tag).returns('/packs/stats.js') # TODO: FIXME!!!
     assert_equal "<script src=\"/packs/stats.js\"></script>", javascript_include_tag('stats.js')
   end