Fix javascript footer (#204)

* fix awesome map scripts

# Conflicts:
#	spec/permissions/admin/permissions_spec.rb

* fix 0.26 test

app/helpers/decidim/decidim_awesome/map_helper.rb

@@ -98,16 +98,19 @@ def awesome_builder
         builder = map_utility_dynamic.create_builder(self, options)
 
         # We need awesome map listeners before initialize the official map
-        unless snippets.any?(:awesome_map)
-          snippets.add(:awesome_map, javascript_pack_tag("decidim_decidim_awesome_map", defer: false))
-          snippets.add(:awesome_map, stylesheet_pack_tag("decidim_decidim_awesome_map"))
-          snippets.add(:head, snippets.for(:awesome_map))
+        unless snippets.any?(:awesome_map_styles) || snippets.any?(:awesome_map_scripts)
+          snippets.add(:awesome_map_styles, stylesheet_pack_tag("decidim_decidim_awesome_map"))
+          snippets.add(:awesome_map_scripts, javascript_pack_tag("decidim_decidim_awesome_map", defer: false))
+          snippets.add(:head, snippets.for(:awesome_map_styles))
+          snippets.add(DecidimAwesome.legacy_version? ? :head : :foot, snippets.for(:awesome_map_scripts))
         end
 
-        unless snippets.any?(:map)
-          snippets.add(:map, builder.stylesheet_snippets)
-          snippets.add(:map, builder.javascript_snippets)
-          snippets.add(:head, snippets.for(:map))
+        unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+          snippets.add(:map_styles, builder.stylesheet_snippets)
+          snippets.add(:map_scripts, builder.javascript_snippets)
+
+          snippets.add(:head, snippets.for(:map_styles))
+          snippets.add(DecidimAwesome.legacy_version? ? :head : :foot, snippets.for(:map_scripts))
         end
 
         builder

spec/system/awesome_map_spec.rb

@@ -31,6 +31,26 @@
     within ".wrapper" do
       expect(page).to have_selector(".awesome-map")
       expect(page).to have_selector("#awesome-map")
+      errors = if legacy_version?
+                 page.driver.browser.manage.logs.get(:browser)
+               else
+                 page.driver.browser.logs.get(:browser)
+               end
+
+      errors.each do |error|
+        expect(error.message).not_to include("map.js"), error.message if error.level == "SEVERE"
+      end
+    end
+  end
+
+  it "has AwesomeMap javascript and CSS" do
+    within "head", visible: :all do
+      expect(page).to have_xpath("//link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome_map')]", visible: :all)
+      expect(page).to have_xpath("//link[@rel='stylesheet'][contains(@href,'decidim_map')]", visible: :all)
+    end
+    within(legacy_version? ? "head" : ".wrapper", visible: :all) do
+      expect(page).to have_xpath("//script[contains(@src,'decidim_decidim_awesome_map')]", visible: :all)
+      expect(page).to have_xpath("//script[contains(@src,'decidim_map')]", visible: :all)
     end
   end