VAPID key generator availabe in core (#9107)

decidim · Mar 29, 2022 · e2f5b9c · e2f5b9c
1 parent 1957e22
commit e2f5b9c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -106,6 +106,7 @@ PATH
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
     decidim-debates (0.27.0.dev)
       decidim-comments (= 0.27.0.dev)
@@ -137,7 +138,6 @@ PATH
       simplecov-cobertura (~> 1.3.1)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
-      webpush (~> 1.1)
       wisper-rspec (~> 1.0)
     decidim-elections (0.27.0.dev)
       decidim-bulletin_board (= 0.22.3)

diff --git a/decidim-core/decidim-core.gemspec b/decidim-core/decidim-core.gemspec
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
   s.add_dependency "social-share-button", "~> 1.2", ">= 1.2.1"
   s.add_dependency "valid_email2", "~> 2.1"
   s.add_dependency "webpacker", "= 6.0.0.rc.5"
+  s.add_dependency "webpush", "~> 1.1"
   s.add_dependency "wisper", "~> 2.0"
 
   s.add_dependency "decidim-api", Decidim::Core.version

diff --git a/decidim-core/spec/controllers/manifests_spec.rb b/decidim-core/spec/controllers/manifests_spec.rb
@@ -9,6 +9,7 @@ module Decidim
     let(:organization) { create(:organization, colors: { "theme" => "#f0f0f0" }) }
 
     before do
+      Decidim::Organization.destroy_all
       request.env["decidim.current_organization"] = organization
     end
 

diff --git a/decidim-dev/decidim-dev.gemspec b/decidim-dev/decidim-dev.gemspec
@@ -47,6 +47,5 @@ Gem::Specification.new do |s|
   s.add_dependency "simplecov-cobertura", "~> 1.3.1"
   s.add_dependency "w3c_rspec_validators", "~> 0.3.0"
   s.add_dependency "webmock", "~> 3.6"
-  s.add_dependency "webpush", "~> 1.1"
   s.add_dependency "wisper-rspec", "~> 1.0"
 end
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
@@ -106,6 +106,7 @@ PATH
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
     decidim-debates (0.27.0.dev)
       decidim-comments (= 0.27.0.dev)
@@ -137,7 +138,6 @@ PATH
       simplecov-cobertura (~> 1.3.1)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
-      webpush (~> 1.1)
       wisper-rspec (~> 1.0)
     decidim-elections (0.27.0.dev)
       decidim-bulletin_board (= 0.22.3)

diff --git a/decidim_app-design/Gemfile.lock b/decidim_app-design/Gemfile.lock
@@ -106,6 +106,7 @@ PATH
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
     decidim-debates (0.27.0.dev)
       decidim-comments (= 0.27.0.dev)
@@ -137,7 +138,6 @@ PATH
       simplecov-cobertura (~> 1.3.1)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
-      webpush (~> 1.1)
       wisper-rspec (~> 1.0)
     decidim-elections (0.27.0.dev)
       decidim-bulletin_board (= 0.22.3)