Using upgrade branch

alecslupu · alecslupu · commit 335f9ea35ef4 · 2021-10-15T12:28:27.000+03:00
diff --git a/decidim-generators/lib/decidim/generators/app_generator.rb b/decidim-generators/lib/decidim/generators/app_generator.rb
@@ -228,7 +228,7 @@ def gem_modifier
         @gem_modifier ||= if options[:path]
                             "path: \"#{options[:path]}\""
                           elsif branch.present?
-                            "git: \"https://github.com/decidim/decidim.git\", branch: \"#{branch}\""
+                            "git: \"https://github.com/tremend-cofe/decidim.git\", branch: \"#{branch}\""
                           else
                             "\"#{Decidim::Generators.version}\""
                           end
@@ -237,7 +237,7 @@ def gem_modifier
       def branch
         return if options[:path]
 
-        @branch ||= options[:edge] ? "develop" : options[:branch].presence
+        @branch ||= options[:edge] ? "upgrade/rails-6.1" : options[:branch].presence
       end
 
       def app_name
@@ -262,7 +262,7 @@ def target_gemfile
         root = if options[:path]
                  expanded_path
                elsif branch.present?
-                 "https://raw.githubusercontent.com/decidim/decidim/#{branch}/decidim-generators"
+                 "https://raw.githubusercontent.com/tremend-cofe/decidim/#{branch}/decidim-generators"
                else
                  root_path
                end
diff --git a/decidim-generators/spec/generators_spec.rb b/decidim-generators/spec/generators_spec.rb
@@ -109,7 +109,7 @@ module Decidim
       end
 
       context "with --branch flag" do
-        let(:default_branch) { "develop" }
+        let(:default_branch) { "upgrade/rails-6.1" }
         let(:command) { "decidim --branch #{default_branch} #{test_app}" }
 
         it_behaves_like "a new production application"
