Skip to content

Commit

Permalink
Bump decidim (#9)
Browse files Browse the repository at this point in the history
* Bump decidim

* Fix i18n spec

* Fix authentication

* Remove useless files
  • Loading branch information
armandfardeau authored May 20, 2022
1 parent 549ac48 commit b44a42d
Show file tree
Hide file tree
Showing 8 changed files with 332 additions and 399 deletions.
685 changes: 310 additions & 375 deletions Gemfile.lock

Large diffs are not rendered by default.

Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ module Decidim
# This holds the decidim-meetings version.
module SocioDemographicAuthorizationHandler
def self.version
"0.24.3"
"0.25.2"
end

def self.decidim_version
"release/0.24-stable"
"release/0.25-stable"
end
end
end
4 changes: 3 additions & 1 deletion spec/i18n_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
ENV["ENFORCED_LOCALES"].presence || "en"
end

let(:i18n) { I18n::Tasks::BaseTask.new({ locales: locales.split(",") }, config_file: nil) }
let(:i18n) do
I18n::Tasks::BaseTask.new(config_file: nil, locales: locales.split(","))
end
let(:missing_keys) { i18n.missing_keys }
let(:unused_keys) { i18n.unused_keys }
let(:non_normalized_paths) { i18n.non_normalized_paths }
Expand Down
17 changes: 17 additions & 0 deletions spec/system/authentication_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,14 @@
before do
OmniAuth.config.test_mode = true
OmniAuth.config.mock_auth[:facebook] = omniauth_hash
OmniAuth.config.add_camelization "facebook", "FaceBook"
OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase)
end

after do
OmniAuth.config.test_mode = false
OmniAuth.config.mock_auth[:facebook] = nil
OmniAuth.config.camelizations.delete("facebook")
end

context "when the user has confirmed the email in facebook" do
Expand Down Expand Up @@ -128,11 +131,15 @@
before do
OmniAuth.config.test_mode = true
OmniAuth.config.mock_auth[:twitter] = omniauth_hash

OmniAuth.config.add_camelization "twitter", "Twitter"
OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase)
end

after do
OmniAuth.config.test_mode = false
OmniAuth.config.mock_auth[:twitter] = nil
OmniAuth.config.camelizations.delete("twitter")
end

context "when the response doesn't include the email" do
Expand Down Expand Up @@ -199,11 +206,15 @@
before do
OmniAuth.config.test_mode = true
OmniAuth.config.mock_auth[:google_oauth2] = omniauth_hash

OmniAuth.config.add_camelization "google_oauth2", "GoogleOauth"
OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase)
end

after do
OmniAuth.config.test_mode = false
OmniAuth.config.mock_auth[:google_oauth2] = nil
OmniAuth.config.camelizations.delete("google_oauth2")
end

it "creates a new User" do
Expand Down Expand Up @@ -469,11 +480,14 @@
before do
OmniAuth.config.test_mode = true
OmniAuth.config.mock_auth[:facebook] = omniauth_hash
OmniAuth.config.add_camelization "facebook", "FaceBook"
OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase)
end

after do
OmniAuth.config.test_mode = false
OmniAuth.config.mock_auth[:facebook] = nil
OmniAuth.config.camelizations.delete("facebook")
end

describe "Sign in" do
Expand Down Expand Up @@ -565,11 +579,14 @@
before do
OmniAuth.config.test_mode = true
OmniAuth.config.mock_auth[:facebook] = omniauth_hash
OmniAuth.config.add_camelization "facebook", "FaceBook"
OmniAuth.config.request_validation_phase = ->(env) {} if OmniAuth.config.respond_to?(:request_validation_phase)
end

after do
OmniAuth.config.test_mode = false
OmniAuth.config.mock_auth[:facebook] = nil
OmniAuth.config.camelizations.delete("facebook")
end

describe "Sign Up" do
Expand Down

0 comments on commit b44a42d

Please sign in to comment.