github_changelog_generator 1.16.4 → 1.18.0

data/lib/github_changelog_generator/octo_fetcher.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "tmpdir"
-require "set"
 require "async"
 require "async/barrier"
 require "async/semaphore"
@@ -59,7 +58,7 @@ module GitHubChangelogGenerator
         end
 
         builder.use Octokit::Response::RaiseError
-        builder.adapter :async_http
+        builder.adapter Faraday.default_adapter
       end
     end
 
@@ -95,12 +94,17 @@ module GitHubChangelogGenerator
     # Fetch all tags from repo
     #
     # @return [Array <Hash>] array of tags
-    def get_all_tags
+    def fetch_all_tags
       print "Fetching tags...\r" if @options[:verbose]
 
       check_github_response { github_fetch_tags }
     end
 
+    def get_all_tags # rubocop:disable Naming/AccessorMethodName
+      warn("[DEPRECATED] GitHubChangelogGenerator::OctoFetcher#get_all_tags is deprecated; use fetch_all_tags instead.")
+      fetch_all_tags
+    end
+
     # Returns the number of pages for a API call
     #
     # @return [Integer] number of pages for this API call in total
@@ -204,7 +208,8 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     # @param [Array] issues
     # @return [Void]
     def fetch_events_async(issues)
-      i = 0
+      fetched_count = 0
+      mutex = Mutex.new
       # Add accept option explicitly for disabling the warning of preview API.
       preview = { accept: Octokit::Preview::PREVIEW_TYPES[:project_card_events] }
 
@@ -221,8 +226,8 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
               issue["events"].concat(new_event)
             end
             issue["events"] = issue["events"].map { |event| stringify_keys_deep(event.to_hash) }
-            print_in_same_line("Fetching events for issues and PR: #{i + 1}/#{issues.count}")
-            i += 1
+            current = mutex.synchronize { fetched_count += 1 }
+            print_in_same_line("Fetching events for issues and PR: #{current}/#{issues.count}")
           end
         end
 
@@ -232,7 +237,7 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
         print_empty_line
       end
 
-      Helper.log.info "Fetching events for issues and PR: #{i}"
+      Helper.log.info "Fetching events for issues and PR: #{fetched_count}"
     end
 
     # Fetch comments for PRs and add them to "comments"
@@ -305,12 +310,13 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
           barrier = Async::Barrier.new
           semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
 
+          branch = @options[:release_branch] || default_branch
           if (since_commit = @options[:since_commit])
-            iterate_pages(client, "commits_since", since_commit, parent: semaphore) do |new_commits|
+            iterate_pages(client, "commits_since", since_commit, branch, parent: semaphore) do |new_commits|
               @commits.concat(new_commits)
             end
           else
-            iterate_pages(client, "commits", parent: semaphore) do |new_commits|
+            iterate_pages(client, "commits", branch, parent: semaphore) do |new_commits|
               @commits.concat(new_commits)
             end
           end
@@ -340,7 +346,13 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     # @param [String] name
     # @return [Array<String>]
     def commits_in_branch(name)
-      @branches ||= client.branches(user_project).map { |branch| [branch[:name], branch] }.to_h
+      @branches ||= begin
+        all_branches = {}
+        iterate_pages(client, "branches") do |branches|
+          branches.each { |branch| all_branches[branch[:name]] = branch }
+        end
+        all_branches
+      end
 
       if (branch = @branches[name])
         commits_in_tag(branch[:commit][:sha])
@@ -375,9 +387,15 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
       queue = [current]
       while queue.any?
         commit = queue.shift
-        # If we've already processed this sha, just grab it's parents from the cache
         if @commits_in_tag_cache.key?(commit[:sha])
+          # If we've already processed this sha in a previous run, just grab
+          # its parents from the cache
           shas.merge(@commits_in_tag_cache[commit[:sha]])
+        elsif shas.include?(commit[:sha])
+          # If we've already processed this sha in the current run, stop there
+          # for the current commit because its parents have already been
+          # queued/processed. Jump to the next queued commit.
+          next
         else
           shas.add(commit[:sha])
           commit[:parents].each do |p|
@@ -513,7 +531,7 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
       env_var
     end
 
-    # @return [String] helper to return Github "user/project"
+    # @return [String] helper to return GitHub "user/project"
     def user_project
       "#{@options[:user]}/#{@options[:project]}"
     end

data/lib/github_changelog_generator/options.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "delegate"
-require "github_changelog_generator/helper"
+require_relative "helper"
 
 module GitHubChangelogGenerator
   # This class wraps Options, and knows a list of known options. Others options
@@ -145,7 +145,17 @@ module GitHubChangelogGenerator
     #
     # @return [Hash] The GitHub `:token` key is censored in the output.
     def censored_values
-      values.clone.tap { |opts| opts[:token] = opts[:token].nil? ? "No token used" : "hidden value" }
+      values.clone.tap { |opts| opts[:token] = censored_token(opts[:token]) }
+    end
+
+    def censored_token(opts_token)
+      if !opts_token.nil?
+        "Used token from options"
+      elsif ENV["CHANGELOG_GITHUB_TOKEN"]
+        "Used token from environment variable"
+      else
+        "No token used"
+      end
     end
 
     def unsupported_options

data/lib/github_changelog_generator/parser.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "github_changelog_generator/helper"
-require "github_changelog_generator/argv_parser"
-require "github_changelog_generator/parser_file"
+require_relative "helper"
+require_relative "argv_parser"
+require_relative "parser_file"
+require_relative "file_parser_chooser"
 
 module GitHubChangelogGenerator
   class Parser

data/lib/github_changelog_generator/parser_file.rb

@@ -1,32 +1,8 @@
 # frozen_string_literal: true
 
-require "pathname"
-
 module GitHubChangelogGenerator
   ParserError = Class.new(StandardError)
 
-  class FileParserChooser
-    def initialize(options)
-      @options     = options
-      @config_file = Pathname.new(options[:config_file])
-    end
-
-    def parse!(_argv)
-      return nil unless (path = resolve_path)
-
-      ParserFile.new(@options, File.open(path)).parse!
-    end
-
-    def resolve_path
-      return @config_file if @config_file.exist?
-
-      path = @config_file.expand_path
-      return path if File.exist?(path)
-
-      nil
-    end
-  end
-
   # ParserFile is a configuration file reader which sets options in the
   # given Hash.
   #

data/lib/github_changelog_generator/task.rb

@@ -58,10 +58,10 @@ module GitHubChangelogGenerator
 
         log = generator.compound_changelog
 
-        output_filename = (options[:output]).to_s
+        output_filename = options[:output].to_s
         File.open(output_filename, "w") { |file| file.write(log) }
         puts "Done!"
-        puts "Generated log placed in #{Dir.pwd}/#{output_filename}"
+        puts "Generated log placed in #{File.absolute_path(output_filename)}"
       end
     end
   end

data/lib/github_changelog_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubChangelogGenerator
-  VERSION = "1.16.4"
+  VERSION = "1.18.0"
 end

data/lib/github_changelog_generator.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require "octokit"
@@ -7,16 +6,15 @@ require "logger"
 require "active_support"
 require "active_support/core_ext/object/blank"
 require "json"
-require "multi_json"
 require "benchmark"
 
-require "github_changelog_generator/helper"
-require "github_changelog_generator/options"
-require "github_changelog_generator/parser"
-require "github_changelog_generator/parser_file"
-require "github_changelog_generator/generator/generator"
-require "github_changelog_generator/version"
-require "github_changelog_generator/reader"
+require_relative "github_changelog_generator/helper"
+require_relative "github_changelog_generator/options"
+require_relative "github_changelog_generator/parser"
+require_relative "github_changelog_generator/parser_file"
+require_relative "github_changelog_generator/generator/generator"
+require_relative "github_changelog_generator/version"
+require_relative "github_changelog_generator/reader"
 
 # The main module, where placed all classes (now, at least)
 module GitHubChangelogGenerator
@@ -24,24 +22,28 @@ module GitHubChangelogGenerator
   class ChangelogGenerator
     # Class, responsible for whole changelog generation cycle
     # @return initialised instance of ChangelogGenerator
-    def initialize
-      @options = Parser.parse_options
-      @generator = Generator.new @options
+    def initialize(params = ARGV)
+      @options = Parser.parse_options(params)
+      @generator = Generator.new(@options)
     end
 
     # The entry point of this script to generate changelog
     # @raise (ChangelogGeneratorError) Is thrown when one of specified tags was not found in list of tags.
     def run
-      log = @generator.compound_changelog
+      log = generator.compound_changelog
 
-      if @options.write_to_file?
-        output_filename = @options[:output].to_s
+      if options.write_to_file?
+        output_filename = options[:output].to_s
         File.open(output_filename, "wb") { |file| file.write(log) }
         puts "Done!"
-        puts "Generated log placed in #{Dir.pwd}/#{output_filename}"
+        puts "Generated log placed in #{File.absolute_path(output_filename)}"
       else
         puts log
       end
     end
+
+    private
+
+    attr_reader :generator, :options
   end
 end

data/man/git-generate-changelog.html

@@ -206,11 +206,11 @@
 
 <p>   --github-site URL</p>
 
-<p>   The Enterprise Github site on which your project is hosted.</p>
+<p>   The Enterprise GitHub site on which your project is hosted.</p>
 
 <p>   --github-api URL</p>
 
-<p>   The enterprise endpoint to use for your Github API.</p>
+<p>   The enterprise endpoint to use for your GitHub API.</p>
 
 <p>   --simple-list</p>
 

data/spec/github_changelog_generator_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+RSpec.describe GitHubChangelogGenerator::ChangelogGenerator do
+  describe "#run" do
+    let(:arguments) { [] }
+    let(:instance)  { described_class.new(arguments) }
+    let(:output_path) { File.join(__dir__, "tmp", "test.output") }
+
+    after { FileUtils.rm_rf(output_path) }
+
+    let(:generator) { instance_double(::GitHubChangelogGenerator::Generator) }
+
+    before do
+      allow(instance).to receive(:generator) { generator }
+      allow(generator).to receive(:compound_changelog) { "content" }
+    end
+
+    context "when full path given as the --output argument" do
+      let(:arguments) { ["--output", output_path]  }
+      it "puts the complete output path to STDOUT" do
+        expect { instance.run }.to output(Regexp.new(output_path)).to_stdout
+      end
+    end
+
+    context "when empty value given as the --output argument" do
+      let(:arguments) { ["--output", ""] }
+      it "puts the complete output path to STDOUT" do
+        expect { instance.run }.to output(/content/).to_stdout
+      end
+    end
+  end
+end

data/spec/unit/generator/entry_spec.rb

@@ -120,7 +120,7 @@ module GitHubChangelogGenerator
 
       let(:pull_requests) do
         [
-          pr("no labels", [], "",  "20", "login" => "user1"),
+          pr("no labels", [], "", "20", "login" => "user1"),
           pr("breaking", ["breaking"], "", "23", "login" => "user5"),
           pr("enhancement", ["enhancement"], "",  "21", "login" => "user5"),
           pr("bug", ["bug"], "", "22", "login" => "user5"),
@@ -129,7 +129,7 @@ module GitHubChangelogGenerator
           pr("security", ["security"], "", "30", "login" => "user5"),
           pr("all the labels", %w[breaking enhancement bug deprecated removed security], "", "24", "login" => "user5"),
           pr("all the labels different order", %w[bug breaking enhancement security remove deprecated], "", "25", "login" => "user5"),
-          pr("some unmapped labels", %w[tests-fail bug], "",  "26", "login" => "user5"),
+          pr("some unmapped labels", %w[tests-fail bug], "", "26", "login" => "user5"),
           pr("no mapped labels", %w[docs maintenance], "", "27", "login" => "user5")
         ]
       end

data/spec/unit/generator/generator_processor_spec.rb

@@ -137,6 +137,67 @@ module GitHubChangelogGenerator
           it { is_expected.to eq(expected_issues) }
         end
       end
+
+      describe "#find_issues_to_add" do
+        let(:issues) { [issue] }
+        let(:tag_name) { nil }
+        let(:filtered_tags) { [] }
+        before { generator.instance_variable_set(:@filtered_tags, filtered_tags) }
+
+        subject { generator.find_issues_to_add(issues, tag_name) }
+
+        context "issue without milestone" do
+          let(:issue) { { "labels" => [] } }
+
+          it { is_expected.to be_empty }
+        end
+
+        context "milestone title not in the filtered tags" do
+          let(:issue) { { "milestone" => { "title" => "a title" } } }
+          let(:filtered_tags) { [{ "name" => "another name" }] }
+
+          it { is_expected.to be_empty }
+        end
+
+        context "milestone title matches the tag name" do
+          let(:tag_name) { "tag name" }
+          let(:issue) { { "milestone" => { "title" => tag_name } } }
+          let(:filtered_tags) { [{ "name" => tag_name }] }
+
+          it { is_expected.to contain_exactly(issue) }
+        end
+      end
+
+      describe "#remove_issues_in_milestones" do
+        let(:issues) { [issue] }
+
+        context "issue without milestone" do
+          let(:issue) { { "labels" => [] } }
+
+          it "is not filtered" do
+            expect { generator.remove_issues_in_milestones(issues) }.to_not(change { issues })
+          end
+        end
+
+        context "remove issues of open milestones if option is set" do
+          let(:issue) { { "milestone" => { "state" => "open" } } }
+          let(:options) { { issues_of_open_milestones: false } }
+
+          it "is filtered" do
+            expect { generator.remove_issues_in_milestones(issues) }.to change { issues }.to([])
+          end
+        end
+
+        context "milestone in the tag list" do
+          let(:milestone_name) { "milestone name" }
+          let(:issue) { { "milestone" => { "title" => milestone_name } } }
+
+          it "is filtered" do
+            generator.instance_variable_set(:@filtered_tags, [{ "name" => milestone_name }])
+            expect { generator.remove_issues_in_milestones(issues) }.to change { issues }.to([])
+          end
+        end
+      end
     end
   end
 end

data/spec/unit/generator/generator_spec.rb

@@ -44,4 +44,155 @@ RSpec.describe GitHubChangelogGenerator::Generator do
       end
     end
   end
+
+  describe "#add_first_occurring_tag_to_prs" do
+    def sha(num)
+      base = num.to_s
+      pad_length = 40 - base.length
+      "#{'a' * pad_length}#{base}"
+    end
+
+    let(:release_branch_name) { "release" }
+    let(:generator) { described_class.new({ release_branch: release_branch_name }) }
+    let(:fake_fetcher) do
+      instance_double(GitHubChangelogGenerator::OctoFetcher,
+                      fetch_tag_shas: nil,
+                      fetch_comments_async: nil)
+    end
+
+    before do
+      allow(fake_fetcher)
+        .to receive(:commits_in_branch).with(release_branch_name)
+                                       .and_return([sha(1), sha(2), sha(3), sha(4)])
+      allow(GitHubChangelogGenerator::OctoFetcher).to receive(:new).and_return(fake_fetcher)
+    end
+
+    it "associates prs to the oldest tag containing the merge commit" do
+      prs = [{ "number" => "23", "events" => [{ "event" => "merged", "commit_id" => sha(2) }] }]
+      tags = [
+        { "name" => "newer2.0", "shas_in_tag" => [sha(1), sha(2), sha(3)] },
+        { "name" => "older1.0", "shas_in_tag" => [sha(1), sha(2)] }
+      ]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to be_empty
+        expect(prs.first["first_occurring_tag"]).to eq "older1.0"
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).not_to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "detects prs merged in the release branch" do
+      prs = [{ "number" => "23", "events" => [{ "event" => "merged", "commit_id" => sha(4) }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to be_empty
+        expect(prs.first["first_occurring_tag"]).to be_nil
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).not_to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "detects closed prs marked as rebased in a tag" do
+      prs = [{ "number" => "23", "comments" => [{ "body" => "rebased commit: #{sha(2)}" }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to be_empty
+        expect(prs.first["first_occurring_tag"]).to eq "v1.0"
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "detects closed prs marked as rebased in the release branch" do
+      prs = [{ "number" => "23", "comments" => [{ "body" => "rebased commit: #{sha(4)}" }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to be_empty
+        expect(prs.first["first_occurring_tag"]).to be_nil
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "leaves prs merged in another branch" do
+      prs = [{ "number" => "23", "events" => [{ "event" => "merged", "commit_id" => sha(5) }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to eq prs
+        expect(prs.first["first_occurring_tag"]).to be_nil
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "detects prs merged elsewhere and marked as rebased in a tag" do
+      prs = [{ "number" => "23",
+               "events" => [{ "event" => "merged", "commit_id" => sha(5) }],
+               "comments" => [{ "body" => "rebased commit: #{sha(2)}" }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to be_empty
+        expect(prs.first["first_occurring_tag"]).to eq "v1.0"
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "detects prs merged elsewhere and marked as rebased in the release branch" do
+      prs = [{ "number" => "23",
+               "events" => [{ "event" => "merged", "commit_id" => sha(5) }],
+               "comments" => [{ "body" => "rebased commit: #{sha(4)}" }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      prs_left = generator.send(:add_first_occurring_tag_to_prs, tags, prs)
+
+      aggregate_failures do
+        expect(prs_left).to be_empty
+        expect(prs.first["first_occurring_tag"]).to be_nil
+
+        expect(fake_fetcher).to have_received(:fetch_tag_shas)
+        expect(fake_fetcher).to have_received(:fetch_comments_async)
+      end
+    end
+
+    it "raises an error for closed prs marked as rebased to an unknown commit" do
+      prs = [{ "number" => "23", "comments" => [{ "body" => "rebased commit: #{sha(5)}" }] }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      expect { generator.send(:add_first_occurring_tag_to_prs, tags, prs) }
+        .to raise_error StandardError, "PR 23 has a rebased SHA comment but that SHA was not found in the release branch or any tags"
+    end
+
+    it "raises an error for prs without merge event or rebase comment" do
+      prs = [{ "number" => "23" }]
+      tags = [{ "name" => "v1.0", "shas_in_tag" => [sha(1), sha(2)] }]
+
+      expect { generator.send(:add_first_occurring_tag_to_prs, tags, prs) }
+        .to raise_error StandardError, "No merge sha found for PR 23 via the GitHub API"
+    end
+  end
 end

data/spec/unit/generator/generator_tags_spec.rb

@@ -49,7 +49,7 @@ describe GitHubChangelogGenerator::Generator do
     let(:generator) { described_class.new(default_options.merge(options)) }
 
     before do
-      allow_any_instance_of(GitHubChangelogGenerator::OctoFetcher).to receive(:get_all_tags).and_return(all_tags)
+      allow_any_instance_of(GitHubChangelogGenerator::OctoFetcher).to receive(:fetch_all_tags).and_return(all_tags)
       allow(generator).to receive(:fetch_tags_dates).with(all_tags)
       allow(generator).to receive(:sort_tags_by_date).with(all_tags).and_return(sorted_tags)
       generator.fetch_and_filter_tags

data/spec/unit/generator/section_spec.rb

@@ -30,5 +30,14 @@ module GitHubChangelogGenerator
         end
       end
     end
+
+    describe "#normalize_body" do
+      context "it should remove CR" do
+        let(:body) { "Some content from GitHub\r\n\r\nUser is describing something" }
+        it "returns a cleaned body" do
+          expect(section.send(:normalize_body, body)).to eq "Some content from GitHub\n\nUser is describing something"
+        end
+      end
+    end
   end
 end

data/spec/unit/octo_fetcher_spec.rb

@@ -72,12 +72,12 @@ describe GitHubChangelogGenerator::OctoFetcher do
     end
   end
 
-  describe "#get_all_tags" do
+  describe "#fetch_all_tags" do
     context "when github_fetch_tags returns tags" do
       it "returns tags" do
         mock_tags = ["tag"]
         allow(fetcher).to receive(:github_fetch_tags).and_return(mock_tags)
-        expect(fetcher.get_all_tags).to eq(mock_tags)
+        expect(fetcher.fetch_all_tags).to eq(mock_tags)
       end
     end
   end
@@ -547,21 +547,21 @@ describe GitHubChangelogGenerator::OctoFetcher do
         expectations = [
           %w[sha decfe840d1a1b86e0c28700de5362d3365a29555],
           ["url",
-           "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555"],
+           "https://api.github.com/repos/github-changelog-generator/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555"],
           # OLD API: "https://api.github.com/repos/skywinder/changelog_test/git/commits/decfe840d1a1b86e0c28700de5362d3365a29555"],
           ["html_url",
-           "https://github.com/skywinder/changelog_test/commit/decfe840d1a1b86e0c28700de5362d3365a29555"],
+           "https://github.com/github-changelog-generator/changelog_test/commit/decfe840d1a1b86e0c28700de5362d3365a29555"],
           ["author",
-           { "login" => "skywinder", "id" => 3_356_474, "avatar_url" => "https://avatars2.githubusercontent.com/u/3356474?v=4", "gravatar_id" => "", "url" => "https://api.github.com/users/skywinder", "html_url" => "https://github.com/skywinder", "followers_url" => "https://api.github.com/users/skywinder/followers", "following_url" => "https://api.github.com/users/skywinder/following{/other_user}", "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}", "starred_url" => "https://api.github.com/users/skywinder/starred{/owner}{/repo}", "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions", "organizations_url" => "https://api.github.com/users/skywinder/orgs", "repos_url" => "https://api.github.com/users/skywinder/repos", "events_url" => "https://api.github.com/users/skywinder/events{/privacy}", "received_events_url" => "https://api.github.com/users/skywinder/received_events", "type" => "User", "site_admin" => false }],
+           { "login" => "skywinder", "node_id" => "MDQ6VXNlcjMzNTY0NzQ=", "id" => 3_356_474, "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=4", "gravatar_id" => "", "url" => "https://api.github.com/users/skywinder", "html_url" => "https://github.com/skywinder", "followers_url" => "https://api.github.com/users/skywinder/followers", "following_url" => "https://api.github.com/users/skywinder/following{/other_user}", "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}", "starred_url" => "https://api.github.com/users/skywinder/starred{/owner}{/repo}", "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions", "organizations_url" => "https://api.github.com/users/skywinder/orgs", "repos_url" => "https://api.github.com/users/skywinder/repos", "events_url" => "https://api.github.com/users/skywinder/events{/privacy}", "received_events_url" => "https://api.github.com/users/skywinder/received_events", "type" => "User", "site_admin" => false }],
           ["committer",
-           { "login" => "skywinder", "id" => 3_356_474, "avatar_url" => "https://avatars2.githubusercontent.com/u/3356474?v=4", "gravatar_id" => "", "url" => "https://api.github.com/users/skywinder", "html_url" => "https://github.com/skywinder", "followers_url" => "https://api.github.com/users/skywinder/followers", "following_url" => "https://api.github.com/users/skywinder/following{/other_user}", "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}", "starred_url" => "https://api.github.com/users/skywinder/starred{/owner}{/repo}", "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions", "organizations_url" => "https://api.github.com/users/skywinder/orgs", "repos_url" => "https://api.github.com/users/skywinder/repos", "events_url" => "https://api.github.com/users/skywinder/events{/privacy}", "received_events_url" => "https://api.github.com/users/skywinder/received_events", "type" => "User", "site_admin" => false }],
+           { "login" => "skywinder", "node_id" => "MDQ6VXNlcjMzNTY0NzQ=", "id" => 3_356_474, "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=4", "gravatar_id" => "", "url" => "https://api.github.com/users/skywinder", "html_url" => "https://github.com/skywinder", "followers_url" => "https://api.github.com/users/skywinder/followers", "following_url" => "https://api.github.com/users/skywinder/following{/other_user}", "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}", "starred_url" => "https://api.github.com/users/skywinder/starred{/owner}{/repo}", "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions", "organizations_url" => "https://api.github.com/users/skywinder/orgs", "repos_url" => "https://api.github.com/users/skywinder/repos", "events_url" => "https://api.github.com/users/skywinder/events{/privacy}", "received_events_url" => "https://api.github.com/users/skywinder/received_events", "type" => "User", "site_admin" => false }],
           ["parents",
            [{ "sha" => "7ec095e5e3caceacedabf44d0b9b10da17c92e51",
               "url" =>
-               "https://api.github.com/repos/skywinder/changelog_test/commits/7ec095e5e3caceacedabf44d0b9b10da17c92e51",
+               "https://api.github.com/repos/github-changelog-generator/changelog_test/commits/7ec095e5e3caceacedabf44d0b9b10da17c92e51",
               # OLD API: "https://api.github.com/repos/skywinder/changelog_test/git/commits/7ec095e5e3caceacedabf44d0b9b10da17c92e51",
               "html_url" =>
-               "https://github.com/skywinder/changelog_test/commit/7ec095e5e3caceacedabf44d0b9b10da17c92e51" }]]
+               "https://github.com/github-changelog-generator/changelog_test/commit/7ec095e5e3caceacedabf44d0b9b10da17c92e51" }]]
         ]
 
         expectations.each do |property, value|