github_changelog_generator 1.15.0.pre.beta → 1.16.1

data/spec/unit/generator/generator_processor_spec.rb

@@ -2,78 +2,140 @@
 
 module GitHubChangelogGenerator
   describe Generator do
-    let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
+    let(:default_options) { GitHubChangelogGenerator::Parser.default_options.merge(verbose: false) }
     let(:options) { {} }
     let(:generator) { described_class.new(default_options.merge(options)) }
-
     let(:bad_label) { { "name" => "BAD" } }
-    let(:bad_issue) { { "labels" => [bad_label] } }
     let(:good_label) { { "name" => "GOOD" } }
-    let(:good_issue) { { "labels" => [good_label] } }
-    let(:unlabeled_issue) { { "labels" => [] } }
-    let(:issues) { [bad_issue, good_issue, unlabeled_issue] }
 
-    describe "#exclude_issues_by_labels" do
-      subject do
-        generator.exclude_issues_by_labels(issues)
-      end
+    describe "pull requests" do
+      let(:bad_pull_request) { { "pull_request" => {}, "labels" => [bad_label] } }
+      let(:good_pull_request) { { "pull_request" => {}, "labels" => [good_label] } }
+      let(:unlabeled_pull_request) { { "pull_request" => {}, "labels" => [] } }
+      let(:pull_requests) { [bad_pull_request, good_pull_request, unlabeled_pull_request] }
 
-      let(:expected_issues) { issues }
+      describe "#filter_wo_labels" do
+        subject do
+          generator.filter_wo_labels(pull_requests)
+        end
 
-      it { is_expected.to eq(expected_issues) }
+        let(:expected_pull_requests) { pull_requests }
 
-      context "when 'exclude_lables' is provided" do
-        let(:options) { { exclude_labels: %w[BAD BOO] } }
-        let(:expected_issues) { [good_issue, unlabeled_issue] }
+        it { is_expected.to eq(expected_pull_requests) }
 
-        it { is_expected.to eq(expected_issues) }
-      end
+        context "when 'add_pr_wo_labels' is false" do
+          let(:options) { { add_pr_wo_labels: false } }
+          let(:expected_pull_requests) { [bad_pull_request, good_pull_request] }
 
-      context "with no option given" do
-        subject(:generator) { described_class.new }
-        it "passes everything through when no option given" do
-          result = generator.exclude_issues_by_labels(issues)
+          it { is_expected.to eq(expected_pull_requests) }
+        end
 
-          expect(result).to eq(issues)
+        context "when 'add_pr_wo_labels' is true" do
+          let(:options) { { add_pr_wo_labels: true } }
+
+          it { is_expected.to eq(expected_pull_requests) }
         end
       end
     end
 
-    describe "#get_filtered_issues" do
-      subject do
-        generator.get_filtered_issues(issues)
-      end
-
-      let(:expected_issues) { issues }
+    describe "issues" do
+      let(:bad_issue) { { "labels" => [bad_label] } }
+      let(:good_issue) { { "labels" => [good_label] } }
+      let(:unlabeled_issue) { { "labels" => [] } }
+      let(:issues) { [bad_issue, good_issue, unlabeled_issue] }
 
-      it { is_expected.to eq(expected_issues) }
+      describe "#filter_wo_labels" do
+        subject do
+          generator.filter_wo_labels(issues)
+        end
 
-      context "when 'exclude_labels' is provided" do
-        let(:options) { { exclude_labels: %w[BAD BOO] } }
-        let(:expected_issues) { [good_issue, unlabeled_issue] }
+        let(:expected_issues) { issues }
 
         it { is_expected.to eq(expected_issues) }
+
+        context "when 'add_issues_wo_labels' is false" do
+          let(:options) { { add_issues_wo_labels: false } }
+          let(:expected_issues) { [bad_issue, good_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
+
+        context "when 'add_issues_wo_labels' is true" do
+          let(:options) { { add_issues_wo_labels: true } }
+
+          it { is_expected.to eq(expected_issues) }
+        end
       end
 
-      context "when 'add_issues_wo_labels' is false" do
-        let(:options) { { add_issues_wo_labels: false } }
-        let(:expected_issues) { [bad_issue, good_issue] }
+      describe "#exclude_issues_by_labels" do
+        subject do
+          generator.exclude_issues_by_labels(issues)
+        end
+
+        let(:expected_issues) { issues }
 
         it { is_expected.to eq(expected_issues) }
 
-        context "with 'exclude_labels'" do
-          let(:options) { { add_issues_wo_labels: false, exclude_labels: %w[GOOD] } }
-          let(:expected_issues) { [bad_issue] }
+        context "when 'exclude_labels' is provided" do
+          let(:options) { { exclude_labels: %w[BAD BOO] } }
+          let(:expected_issues) { [good_issue, unlabeled_issue] }
 
           it { is_expected.to eq(expected_issues) }
         end
+
+        context "with no option given" do
+          subject(:generator) { described_class.new }
+          it "passes everything through when no option given" do
+            result = generator.exclude_issues_by_labels(issues)
+
+            expect(result).to eq(issues)
+          end
+        end
       end
 
-      context "when 'include_labels' is specified" do
-        let(:options) { { include_labels: %w[GOOD] } }
-        let(:expected_issues) { [good_issue] }
+      describe "#get_filtered_issues" do
+        subject do
+          generator.get_filtered_issues(issues)
+        end
+
+        let(:expected_issues) { issues }
 
         it { is_expected.to eq(expected_issues) }
+
+        context "when 'exclude_labels' is provided" do
+          let(:options) { { exclude_labels: %w[BAD BOO] } }
+          let(:expected_issues) { [good_issue, unlabeled_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
+
+        context "when 'add_issues_wo_labels' is false" do
+          let(:options) { { add_issues_wo_labels: false } }
+          let(:expected_issues) { [bad_issue, good_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+
+          context "with 'exclude_labels'" do
+            let(:options) { { add_issues_wo_labels: false, exclude_labels: %w[GOOD] } }
+            let(:expected_issues) { [bad_issue] }
+
+            it { is_expected.to eq(expected_issues) }
+          end
+
+          context "with 'include_labels'" do
+            let(:options) { { add_issues_wo_labels: false, include_labels: %w[GOOD] } }
+            let(:expected_issues) { [good_issue] }
+
+            it { is_expected.to eq(expected_issues) }
+          end
+        end
+
+        context "when 'include_labels' is specified" do
+          let(:options) { { include_labels: %w[GOOD] } }
+          let(:expected_issues) { [good_issue, unlabeled_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
       end
     end
   end

data/spec/unit/generator/generator_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "github_changelog_generator/generator/generator"
+
+RSpec.describe GitHubChangelogGenerator::Generator do
+  let(:header) { "# Changelog" }
+  let(:generator) { described_class.new({ header: header }) }
+  let(:content) do
+    <<~'BASE'
+      ## [1.3.10](https://github.com/xxx/yyy/tree/1.3.10) (2015-03-18)
+
+      [Full Changelog](https://github.com/xxx/yyy/compare/1.3.9...1.3.10)
+
+      **Fixed bugs:**
+
+
+    BASE
+  end
+  let(:footer) do
+    <<~CREDIT
+      \\* *This Changelog was automatically generated \
+      by [github_changelog_generator]\
+      (https://github.com/github-changelog-generator/github-changelog-generator)*
+    CREDIT
+  end
+
+  context "when the given base file has previously appended template messages" do
+    describe "#remove_old_fixed_string" do
+      it "removes old template headers and footers" do
+        log = +"#{header}\n\n#{header}\n#{header}#{content}\n\n#{footer}\n#{footer}#{footer}"
+
+        expect(generator.send(:remove_old_fixed_string, log)).to eq content
+      end
+    end
+  end
+
+  context "when plain contents string was given" do
+    describe "#insert_fixed_string" do
+      it "append template messages at header and footer" do
+        log = String.new(content)
+        ans = "#{header}\n\n#{content}\n\n#{footer}"
+
+        expect(generator.send(:insert_fixed_string, log)).to eq ans
+      end
+    end
+  end
+end

data/spec/unit/generator/generator_tags_spec.rb

@@ -13,11 +13,38 @@ describe GitHubChangelogGenerator::Generator do
     end
   end
 
+  describe "#detect_link_tag_time" do
+    let(:newer_tag) { nil }
+
+    let(:default_options) { GitHubChangelogGenerator::Parser.default_options.merge(verbose: false) }
+    let(:options) do
+      {
+        future_release: "2.0.0"
+      }
+    end
+    let(:generator) { described_class.new(default_options.merge(options)) }
+
+    subject do
+      generator.detect_link_tag_time(newer_tag)
+    end
+
+    context "When the local date is not the same as the UTC date" do
+      before do
+        # 2020-12-27T17:00:00-10:00 is 2020-12-28T03:00:00Z.
+        # GitHub API date & time use UTC, so this instant when converted as a
+        # date should be 2020-12-28.
+        expect(Time).to receive(:new).and_return(Time.new(2020, 12, 27, 17, 0, 0, "-10:00"))
+      end
+
+      it { is_expected.to eq(["2.0.0", "2.0.0", Time.gm(2020, 12, 28, 3)]) }
+    end
+  end
+
   describe "#tag_section_mapping" do
     let(:all_tags) { tags_from_strings(%w[8 7 6 5 4 3 2 1]) }
     let(:sorted_tags) { all_tags }
 
-    let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
+    let(:default_options) { GitHubChangelogGenerator::Parser.default_options.merge(verbose: false) }
     let(:options) { {} }
     let(:generator) { described_class.new(default_options.merge(options)) }
 
@@ -57,10 +84,10 @@ describe GitHubChangelogGenerator::Generator do
     shared_examples_for "a changelog with some exclusions" do
       let(:expected_mapping) do
         {
-          tag_with_name("8") => [tag_with_name("7"), tag_with_name("8")],
-          tag_with_name("6") => [tag_with_name("5"), tag_with_name("6")],
+          tag_with_name("8") => [tag_with_name("6"), tag_with_name("8")],
+          tag_with_name("6") => [tag_with_name("4"), tag_with_name("6")],
           tag_with_name("4") => [tag_with_name("3"), tag_with_name("4")],
-          tag_with_name("3") => [tag_with_name("2"), tag_with_name("3")],
+          tag_with_name("3") => [tag_with_name("1"), tag_with_name("3")],
           tag_with_name("1") => [nil, tag_with_name("1")]
         }
       end
@@ -130,6 +157,22 @@ describe GitHubChangelogGenerator::Generator do
     end
   end
 
+  describe "#filter_included_tags_regex" do
+    subject { generator.filter_included_tags(tags_from_strings(%w[1 2 3])) }
+
+    context "with matching regex" do
+      let(:generator) { GitHubChangelogGenerator::Generator.new(include_tags_regex: "[23]") }
+      it { is_expected.to be_a Array }
+      it { is_expected.to match_array(tags_from_strings(%w[2 3])) }
+    end
+
+    context "with non-matching regex" do
+      let(:generator) { GitHubChangelogGenerator::Generator.new(include_tags_regex: "[45]") }
+      it { is_expected.to be_a Array }
+      it { is_expected.to match_array(tags_from_strings(%w[])) }
+    end
+  end
+
   describe "#filter_excluded_tags" do
     subject { generator.filter_excluded_tags(tags_from_strings(%w[1 2 3])) }
 
@@ -191,24 +234,16 @@ describe GitHubChangelogGenerator::Generator do
 
       context "with invalid since tag" do
         let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "Invalid tag") }
-        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
+        it { expect { subject }.to raise_error(GitHubChangelogGenerator::ChangelogGeneratorError) }
       end
     end
 
     context "with empty array" do
       subject { generator.filter_since_tag(tags_from_strings(%w[])) }
 
-      context "with valid since tag" do
-        let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "2") }
-        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w[])) }
-      end
-
       context "with invalid since tag" do
         let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "Invalid tag") }
-        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w[])) }
+        it { expect { subject }.to raise_error(GitHubChangelogGenerator::ChangelogGeneratorError) }
       end
     end
   end
@@ -225,24 +260,16 @@ describe GitHubChangelogGenerator::Generator do
 
       context "with invalid due tag" do
         let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "Invalid tag") }
-        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
+        it { expect { subject }.to raise_error(GitHubChangelogGenerator::ChangelogGeneratorError) }
       end
     end
 
     context "with empty array" do
       subject { generator.filter_due_tag(tags_from_strings(%w[])) }
 
-      context "with valid due tag" do
-        let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "2") }
-        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w[])) }
-      end
-
       context "with invalid due tag" do
         let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "Invalid tag") }
-        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w[])) }
+        it { expect { subject }.to raise_error(GitHubChangelogGenerator::ChangelogGeneratorError) }
       end
     end
   end

data/spec/unit/generator/section_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module GitHubChangelogGenerator
+  RSpec.describe Section do
+    let(:options) { {} }
+    subject(:section) { described_class.new(options) }
+
+    describe "#encapsulate_string" do
+      let(:string) { "" }
+
+      context "with the empty string" do
+        it "returns the string" do
+          expect(section.send(:encapsulate_string, string)).to eq string
+        end
+      end
+
+      context "with a string with an escape-needing character in it" do
+        let(:string) { "<Inside> and outside" }
+
+        it "returns the string escaped" do
+          expect(section.send(:encapsulate_string, string)).to eq '\\<Inside\\> and outside'
+        end
+      end
+
+      context "with a backticked string with an escape-needing character in it" do
+        let(:string) { 'back `\` slash' }
+
+        it "returns the string" do
+          expect(section.send(:encapsulate_string, string)).to eq 'back `\` slash'
+        end
+      end
+    end
+  end
+end

data/spec/unit/octo_fetcher_spec.rb

@@ -6,7 +6,7 @@ INVALID_TOKEN = "0000000000000000"
 describe GitHubChangelogGenerator::OctoFetcher do
   let(:options) do
     {
-      user: "skywinder",
+      user: "github-changelog-generator",
       project: "changelog_test"
     }
   end
@@ -85,11 +85,54 @@ describe GitHubChangelogGenerator::OctoFetcher do
     end
   end
 
+  describe "#fetch_tag_shas" do
+    let(:commits) do
+      [
+        { sha: "0", parents: [{ sha: "1" }, { sha: "6" }] },
+        { sha: "1", parents: [{ sha: "2" }] },
+        { sha: "2", parents: [{ sha: "3" }] },
+        { sha: "3", parents: [{ sha: "4" }] },
+        { sha: "4", parents: [{ sha: "5" }] },
+        { sha: "5", parents: [] },
+        { sha: "6", parents: [{ sha: "7" }, { sha: "8" }] },
+        { sha: "7", parents: [{ sha: "9" }, { sha: "10" }] },
+        { sha: "8", parents: [{ sha: "11" }, { sha: "12" }] },
+        { sha: "9", parents: [] },
+        { sha: "10", parents: [] },
+        { sha: "11", parents: [] },
+        { sha: "12", parents: [] }
+      ]
+    end
+
+    let(:tag0) { { "name" => "tag-0", "commit" => { "sha" => "0" } } }
+    let(:tag1) { { "name" => "tag-1", "commit" => { "sha" => "1" } } }
+    let(:tag6) { { "name" => "tag-6", "commit" => { "sha" => "6" } } }
+
+    before do
+      allow(fetcher).to receive(:commits).and_return(commits)
+    end
+
+    it "should find all shas with single parents" do
+      fetcher.fetch_tag_shas([tag1])
+      expect(tag1["shas_in_tag"]).to eq(Set.new(%w[1 2 3 4 5]))
+    end
+
+    it "should find all shas with multiple parents" do
+      fetcher.fetch_tag_shas([tag6])
+      expect(tag6["shas_in_tag"]).to eq(Set.new(%w[6 7 8 9 10 11 12]))
+    end
+
+    it "should find all shas with mixed parents" do
+      fetcher.fetch_tag_shas([tag0])
+      expect(tag0["shas_in_tag"]).to eq(Set.new(%w[0 1 2 3 4 5 6 7 8 9 10 11 12]))
+    end
+  end
+
   describe "#github_fetch_tags" do
     context "when wrong token provided", :vcr do
       let(:options) do
         {
-          user: "skywinder",
+          user: "github-changelog-generator",
           project: "changelog_test",
           token: INVALID_TOKEN
         }
@@ -102,39 +145,39 @@ describe GitHubChangelogGenerator::OctoFetcher do
 
     context "when API call is valid", :vcr do
       it "should return tags" do
-        expected_tags = [{ "name"        => "v0.0.3",
+        expected_tags = [{ "name" => "v0.0.3",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.3",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.3",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90" } },
-                         { "name"        => "v0.0.2",
+                         { "name" => "v0.0.2",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.2",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.2",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "9b35bb13dcd15b68e7bcbf10cde5eb937a54f710",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/9b35bb13dcd15b68e7bcbf10cde5eb937a54f710" } },
-                         { "name"        => "v0.0.1",
+                         { "name" => "v0.0.1",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.1",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.1",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "4c2d6d1ed58bdb24b870dcb5d9f2ceed0283d69d",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/4c2d6d1ed58bdb24b870dcb5d9f2ceed0283d69d" } },
-                         { "name"        => "0.0.4",
+                         { "name" => "0.0.4",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/0.0.4",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/0.0.4",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "ece0c3ab7142b21064b885061c55ede00ef6ce94",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/ece0c3ab7142b21064b885061c55ede00ef6ce94" } }]
@@ -160,54 +203,54 @@ describe GitHubChangelogGenerator::OctoFetcher do
       it "returns issue with proper key/values" do
         issues, _pull_requests = fetcher.fetch_closed_issues_and_pr
 
-        expected_issue = { "url"            => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
+        expected_issue = { "url" => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
                            "repository_url" => "https://api.github.com/repos/skywinder/changelog_test",
-                           "labels_url"     =>
+                           "labels_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/issues/14/labels{/name}",
-                           "comments_url"   =>
+                           "comments_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/issues/14/comments",
-                           "events_url"     =>
+                           "events_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/issues/14/events",
-                           "html_url"       => "https://github.com/skywinder/changelog_test/issues/14",
-                           "id"             => 95_419_412,
-                           "number"         => 14,
-                           "title"          => "Issue closed from commit from PR",
-                           "user"           =>
-                             { "login"               => "skywinder",
-                               "id"                  => 3_356_474,
-                               "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                               "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"       =>
+                           "html_url" => "https://github.com/skywinder/changelog_test/issues/14",
+                           "id" => 95_419_412,
+                           "number" => 14,
+                           "title" => "Issue closed from commit from PR",
+                           "user" =>
+                             { "login" => "skywinder",
+                               "id" => 3_356_474,
+                               "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                               "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"         =>
+                               "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}",
+                               "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 },
-                           "labels"         => [],
-                           "state"          => "closed",
-                           "locked"         => false,
-                           "assignee"       => nil,
+                               "type" => "User",
+                               "site_admin" => false },
+                           "labels" => [],
+                           "state" => "closed",
+                           "locked" => false,
+                           "assignee" => nil,
                            "assignees" => [],
-                           "milestone"      => nil,
-                           "comments"       => 0,
-                           "created_at"     => "2015-07-16T12:06:08Z",
-                           "updated_at"     => "2015-07-16T12:21:42Z",
-                           "closed_at"      => "2015-07-16T12:21:42Z",
-                           "body"           => "" }
+                           "milestone" => nil,
+                           "comments" => 0,
+                           "created_at" => "2015-07-16T12:06:08Z",
+                           "updated_at" => "2015-07-16T12:21:42Z",
+                           "closed_at" => "2015-07-16T12:21:42Z",
+                           "body" => "" }
 
         # Convert times to Time
         expected_issue.each_pair do |k, v|
-          expected_issue[k] = Time.parse(v) if v =~ /^2015-/
+          expected_issue[k] = Time.parse(v) if v.to_s.start_with?("2015-")
         end
 
         expect(issues.first).to eq(expected_issue)
@@ -216,60 +259,60 @@ describe GitHubChangelogGenerator::OctoFetcher do
       it "returns pull request with proper key/values" do
         _issues, pull_requests = fetcher.fetch_closed_issues_and_pr
 
-        expected_pr = { "url"            => "https://api.github.com/repos/skywinder/changelog_test/issues/21",
+        expected_pr = { "url" => "https://api.github.com/repos/skywinder/changelog_test/issues/21",
                         "repository_url" => "https://api.github.com/repos/skywinder/changelog_test",
-                        "labels_url"     =>
+                        "labels_url" =>
                           "https://api.github.com/repos/skywinder/changelog_test/issues/21/labels{/name}",
-                        "comments_url"   =>
+                        "comments_url" =>
                           "https://api.github.com/repos/skywinder/changelog_test/issues/21/comments",
-                        "events_url"     =>
+                        "events_url" =>
                           "https://api.github.com/repos/skywinder/changelog_test/issues/21/events",
-                        "html_url"       => "https://github.com/skywinder/changelog_test/pull/21",
-                        "id"             => 124_925_759,
-                        "number"         => 21,
-                        "title"          => "Merged br (should appear in change log with  #20)",
-                        "user"           =>
-                          { "login"               => "skywinder",
-                            "id"                  => 3_356_474,
-                            "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                            "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"       =>
+                        "html_url" => "https://github.com/skywinder/changelog_test/pull/21",
+                        "id" => 124_925_759,
+                        "number" => 21,
+                        "title" => "Merged br (should appear in change log with  #20)",
+                        "user" =>
+                          { "login" => "skywinder",
+                            "id" => 3_356_474,
+                            "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                            "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"         =>
+                            "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}",
+                            "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 },
-                        "labels"         => [],
-                        "state"          => "closed",
-                        "locked"         => false,
-                        "assignee"       => nil,
+                            "type" => "User",
+                            "site_admin" => false },
+                        "labels" => [],
+                        "state" => "closed",
+                        "locked" => false,
+                        "assignee" => nil,
                         "assignees" => [],
-                        "milestone"      => nil,
-                        "comments"       => 0,
-                        "created_at"     => "2016-01-05T09:24:08Z",
-                        "updated_at"     => "2016-01-05T09:26:53Z",
-                        "closed_at"      => "2016-01-05T09:24:27Z",
-                        "pull_request"   =>
-                          { "url"       => "https://api.github.com/repos/skywinder/changelog_test/pulls/21",
-                            "html_url"  => "https://github.com/skywinder/changelog_test/pull/21",
-                            "diff_url"  => "https://github.com/skywinder/changelog_test/pull/21.diff",
+                        "milestone" => nil,
+                        "comments" => 0,
+                        "created_at" => "2016-01-05T09:24:08Z",
+                        "updated_at" => "2016-01-05T09:26:53Z",
+                        "closed_at" => "2016-01-05T09:24:27Z",
+                        "pull_request" =>
+                          { "url" => "https://api.github.com/repos/skywinder/changelog_test/pulls/21",
+                            "html_url" => "https://github.com/skywinder/changelog_test/pull/21",
+                            "diff_url" => "https://github.com/skywinder/changelog_test/pull/21.diff",
                             "patch_url" => "https://github.com/skywinder/changelog_test/pull/21.patch" },
-                        "body"           =>
+                        "body" =>
                           "to test https://github.com/skywinder/github-changelog-generator/pull/305\r\nshould appear in change log with #20" }
 
         # Convert times to Time
         expected_pr.each_pair do |k, v|
-          expected_pr[k] = Time.parse(v) if v =~ /^2016-01/
+          expected_pr[k] = Time.parse(v) if v.to_s.start_with?("2016-01")
         end
 
         expect(pull_requests.first).to eq(expected_pr)
@@ -308,51 +351,51 @@ describe GitHubChangelogGenerator::OctoFetcher do
   describe "#fetch_events_async" do
     context "when API call is valid", :vcr do
       it "populates issues" do
-        issues = [{ "url"            => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
+        issues = [{ "url" => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
                     "repository_url" => "https://api.github.com/repos/skywinder/changelog_test",
-                    "labels_url"     =>
+                    "labels_url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/issues/14/labels{/name}",
-                    "comments_url"   =>
+                    "comments_url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/issues/14/comments",
-                    "events_url"     =>
+                    "events_url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/issues/14/events",
-                    "html_url"       => "https://github.com/skywinder/changelog_test/issues/14",
-                    "id"             => 95_419_412,
-                    "number"         => 14,
-                    "title"          => "Issue closed from commit from PR",
-                    "user"           =>
-                      { "login"               => "skywinder",
-                        "id"                  => 3_356_474,
-                        "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                        "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"       =>
+                    "html_url" => "https://github.com/skywinder/changelog_test/issues/14",
+                    "id" => 95_419_412,
+                    "number" => 14,
+                    "title" => "Issue closed from commit from PR",
+                    "user" =>
+                      { "login" => "skywinder",
+                        "id" => 3_356_474,
+                        "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                        "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"         =>
+                        "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                        "starred_url" =>
                           "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                        "subscriptions_url"   =>
+                        "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}",
+                        "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 },
-                    "labels"         => [],
-                    "state"          => "closed",
-                    "locked"         => false,
-                    "assignee"       => nil,
+                        "type" => "User",
+                        "site_admin" => false },
+                    "labels" => [],
+                    "state" => "closed",
+                    "locked" => false,
+                    "assignee" => nil,
                     "assignees" => [],
-                    "milestone"      => nil,
-                    "comments"       => 0,
-                    "created_at"     => "2015-07-16T12:06:08Z",
-                    "updated_at"     => "2015-07-16T12:21:42Z",
-                    "closed_at"      => "2015-07-16T12:21:42Z",
-                    "body"           => "" }]
+                    "milestone" => nil,
+                    "comments" => 0,
+                    "created_at" => "2015-07-16T12:06:08Z",
+                    "updated_at" => "2015-07-16T12:21:42Z",
+                    "closed_at" => "2015-07-16T12:21:42Z",
+                    "body" => "" }]
 
         # Check that they are blank to begin with
         expect(issues.first["events"]).to be_nil
@@ -360,63 +403,63 @@ describe GitHubChangelogGenerator::OctoFetcher do
         fetcher.fetch_events_async(issues)
         issue_events = issues.first["events"]
 
-        expected_events = [{ "id"         => 357_462_189,
-                             "url"        =>
+        expected_events = [{ "id" => 357_462_189,
+                             "url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/issues/events/357462189",
-                             "actor"      =>
-                               { "login"               => "skywinder",
-                                 "id"                  => 3_356_474,
-                                 "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                                 "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"       =>
+                             "actor" =>
+                               { "login" => "skywinder",
+                                 "id" => 3_356_474,
+                                 "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                                 "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"         =>
+                                 "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                                 "starred_url" =>
                                    "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                                 "subscriptions_url"   =>
+                                 "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}",
+                                 "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 },
-                             "event"      => "referenced",
-                             "commit_id"  => "decfe840d1a1b86e0c28700de5362d3365a29555",
+                                 "type" => "User",
+                                 "site_admin" => false },
+                             "event" => "referenced",
+                             "commit_id" => "decfe840d1a1b86e0c28700de5362d3365a29555",
                              "commit_url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555",
                              "created_at" => "2015-07-16T12:21:16Z" },
-                           { "id"         => 357_462_542,
-                             "url"        =>
+                           { "id" => 357_462_542,
+                             "url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/issues/events/357462542",
-                             "actor"      =>
-                               { "login"               => "skywinder",
-                                 "id"                  => 3_356_474,
-                                 "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                                 "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"       =>
+                             "actor" =>
+                               { "login" => "skywinder",
+                                 "id" => 3_356_474,
+                                 "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                                 "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"         =>
+                                 "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                                 "starred_url" =>
                                    "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                                 "subscriptions_url"   =>
+                                 "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}",
+                                 "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 },
-                             "event"      => "closed",
-                             "commit_id"  => "decfe840d1a1b86e0c28700de5362d3365a29555",
+                                 "type" => "User",
+                                 "site_admin" => false },
+                             "event" => "closed",
+                             "commit_id" => "decfe840d1a1b86e0c28700de5362d3365a29555",
                              "commit_url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555",
                              "created_at" => "2015-07-16T12:21:42Z" }]
@@ -424,7 +467,7 @@ describe GitHubChangelogGenerator::OctoFetcher do
         # Convert times to Time
         expected_events.map! do |event|
           event.each_pair do |k, v|
-            event[k] = Time.parse(v) if v =~ /^201[56]-/
+            event[k] = Time.parse(v) if v.to_s =~ /^201[56]-/
           end
         end
 
@@ -436,17 +479,21 @@ describe GitHubChangelogGenerator::OctoFetcher do
   describe "#fetch_date_of_tag" do
     context "when API call is valid", :vcr do
       it "returns date" do
-        tag = { "name"        => "v0.0.3",
+        tag = { "name" => "v0.0.3",
                 "zipball_url" =>
                   "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.3",
                 "tarball_url" =>
                   "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.3",
-                "commit"      =>
+                "commit" =>
                   { "sha" => "a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90",
                     "url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/commits/a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90" } }
 
-        dt = fetcher.fetch_date_of_tag(tag)
+        skywinder = GitHubChangelogGenerator::OctoFetcher.new(
+          user: "skywinder",
+          project: "changelog_test"
+        )
+        dt = skywinder.fetch_date_of_tag(tag)
         expect(dt).to eq(Time.parse("2015-03-04 19:01:48 UTC"))
       end
     end
@@ -469,36 +516,36 @@ describe GitHubChangelogGenerator::OctoFetcher do
   describe "#fetch_commit" do
     context "when API call is valid", :vcr do
       it "returns commit" do
-        event = { "id"         => 357_462_189,
-                  "url"        =>
+        event = { "id" => 357_462_189,
+                  "url" =>
                     "https://api.github.com/repos/skywinder/changelog_test/issues/events/357462189",
-                  "actor"      =>
-                    { "login"               => "skywinder",
-                      "id"                  => 3_356_474,
-                      "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                      "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"       =>
+                  "actor" =>
+                    { "login" => "github-changelog-generator",
+                      "id" => 3_356_474,
+                      "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                      "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"         =>
+                      "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}",
+                      "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 },
-                  "event"      => "referenced",
-                  "commit_id"  => "decfe840d1a1b86e0c28700de5362d3365a29555",
+                      "type" => "User",
+                      "site_admin" => false },
+                  "event" => "referenced",
+                  "commit_id" => "decfe840d1a1b86e0c28700de5362d3365a29555",
                   "commit_url" =>
                     "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555",
                   "created_at" => "2015-07-16T12:21:16Z" }
-        commit = fetcher.fetch_commit(event)
+        commit = fetcher.fetch_commit(event["commit_id"])
 
         expectations = [
           %w[sha decfe840d1a1b86e0c28700de5362d3365a29555],
@@ -508,9 +555,9 @@ describe GitHubChangelogGenerator::OctoFetcher do
           ["html_url",
            "https://github.com/skywinder/changelog_test/commit/decfe840d1a1b86e0c28700de5362d3365a29555"],
           ["author",
-           { "login" => "skywinder", "id" => 3_356_474, "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3", "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", "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 }],
           ["committer",
-           { "login" => "skywinder", "id" => 3_356_474, "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3", "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", "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 }],
           ["parents",
            [{ "sha" => "7ec095e5e3caceacedabf44d0b9b10da17c92e51",
               "url" =>
@@ -520,19 +567,22 @@ describe GitHubChangelogGenerator::OctoFetcher do
                "https://github.com/skywinder/changelog_test/commit/7ec095e5e3caceacedabf44d0b9b10da17c92e51" }]]
         ]
 
-        expectations.each do |property, val|
-          expect(commit[property]).to eq(val)
+        expectations.each do |property, value|
+          case value
+          when String, Array
+            expect(commit[property]).to eq(value)
+          when Hash
+            expect(commit[property]).to include(value)
+          end
         end
       end
     end
   end
 
-  describe "#commits_before" do
+  describe "#commits" do
     context "when API is valid", :vcr do
-      let(:start_time) { Time.parse("Wed Mar 4 18:47:17 2015 +0200") }
-
       subject do
-        fetcher.commits_before(start_time)
+        fetcher.commits
       end
 
       it "returns commits" do