Fix bug in ContributionChecker::Checker#user_is_repo_org_member? and add test coverage

Author: jdennes

lib/contribution-checker/checker.rb

@@ -171,7 +171,7 @@ def user_has_starred_repo?
     #
     # @return [Boolean]
     def user_is_repo_org_member?
-      return false if @repo[:owner] != "Organization"
+      return false if @repo[:owner][:type] != "Organization"
       @client.organization_member? @repo[:owner][:login], @user[:login]
     end
 

spec/contribution-checker/checker_spec.rb

@@ -209,6 +209,48 @@
       end
     end
 
+
+    context "when a commit is in the default branch and the user is a member of the org owning the repository" do
+      let(:checker) { checker = ContributionChecker::Checker.new \
+        :access_token => "token",
+        :commit_url   => "https://github.com/jdennes/contribution-checker/commit/731e83d4abf1bd67ac6ab68d18387693482e47cf"
+      }
+
+      before do
+        stub_get("/repos/jdennes/contribution-checker/commits/731e83d4abf1bd67ac6ab68d18387693482e47cf").
+          to_return(json_response("commit.json"))
+        stub_get("/repos/jdennes/contribution-checker").
+          to_return(json_response("org_owned_repo.json"))
+        stub_get("/user").
+          to_return(json_response("user.json"))
+        stub_get("/repos/jdennes/contribution-checker/compare/master...731e83d4abf1bd67ac6ab68d18387693482e47cf").
+          to_return(json_response("default_compare.json"))
+        stub_get("/user/emails").
+          to_return(json_response("emails.json"))
+        stub_get("/user/starred/jdennes/contribution-checker").
+          to_return(:status => 404)
+        stub_get("/orgs/github/members/jdennes").
+          to_return(:status => 204)
+      end
+
+      it "returns the check result" do
+        result = checker.check
+        expect(result).to be_a(Hash)
+
+        expect(result[:contribution]).to eq(true)
+
+        expect(result[:and_criteria][:commit_in_valid_branch]).to eq(true)
+        expect(result[:and_criteria][:commit_in_last_year]).to eq(true)
+        expect(result[:and_criteria][:repo_not_a_fork]).to eq(true)
+        expect(result[:and_criteria][:commit_email_linked_to_user]).to eq(true)
+
+        expect(result[:or_criteria][:user_has_starred_repo]).to eq(false)
+        expect(result[:or_criteria][:user_can_push_to_repo]).to eq(true)
+        expect(result[:or_criteria][:user_is_repo_org_member]).to eq(true)
+        expect(result[:or_criteria][:user_has_fork_of_repo]).to eq(false)
+      end
+    end
+
   end
 
 end

spec/fixtures/org_owned_repo.json

@@ -0,0 +1,93 @@
+{
+  "id": 20517235,
+  "name": "contribution-checker",
+  "full_name": "jdennes/contribution-checker",
+  "owner": {
+    "login": "github",
+    "id": 65057,
+    "avatar_url": "https://avatars.githubusercontent.com/u/65057?",
+    "gravatar_id": "55fd031da91ef9af6e6ed88b101416a1",
+    "url": "https://api.github.com/users/jdennes",
+    "html_url": "https://github.com/jdennes",
+    "followers_url": "https://api.github.com/users/jdennes/followers",
+    "following_url": "https://api.github.com/users/jdennes/following{/other_user}",
+    "gists_url": "https://api.github.com/users/jdennes/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/jdennes/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/jdennes/subscriptions",
+    "organizations_url": "https://api.github.com/users/jdennes/orgs",
+    "repos_url": "https://api.github.com/users/jdennes/repos",
+    "events_url": "https://api.github.com/users/jdennes/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/jdennes/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "private": false,
+  "html_url": "https://github.com/jdennes/contribution-checker",
+  "description": "Check whether one of your GitHub commits qualifies as a contribution.",
+  "fork": false,
+  "url": "https://api.github.com/repos/jdennes/contribution-checker",
+  "forks_url": "https://api.github.com/repos/jdennes/contribution-checker/forks",
+  "keys_url": "https://api.github.com/repos/jdennes/contribution-checker/keys{/key_id}",
+  "collaborators_url": "https://api.github.com/repos/jdennes/contribution-checker/collaborators{/collaborator}",
+  "teams_url": "https://api.github.com/repos/jdennes/contribution-checker/teams",
+  "hooks_url": "https://api.github.com/repos/jdennes/contribution-checker/hooks",
+  "issue_events_url": "https://api.github.com/repos/jdennes/contribution-checker/issues/events{/number}",
+  "events_url": "https://api.github.com/repos/jdennes/contribution-checker/events",
+  "assignees_url": "https://api.github.com/repos/jdennes/contribution-checker/assignees{/user}",
+  "branches_url": "https://api.github.com/repos/jdennes/contribution-checker/branches{/branch}",
+  "tags_url": "https://api.github.com/repos/jdennes/contribution-checker/tags",
+  "blobs_url": "https://api.github.com/repos/jdennes/contribution-checker/git/blobs{/sha}",
+  "git_tags_url": "https://api.github.com/repos/jdennes/contribution-checker/git/tags{/sha}",
+  "git_refs_url": "https://api.github.com/repos/jdennes/contribution-checker/git/refs{/sha}",
+  "trees_url": "https://api.github.com/repos/jdennes/contribution-checker/git/trees{/sha}",
+  "statuses_url": "https://api.github.com/repos/jdennes/contribution-checker/statuses/{sha}",
+  "languages_url": "https://api.github.com/repos/jdennes/contribution-checker/languages",
+  "stargazers_url": "https://api.github.com/repos/jdennes/contribution-checker/stargazers",
+  "contributors_url": "https://api.github.com/repos/jdennes/contribution-checker/contributors",
+  "subscribers_url": "https://api.github.com/repos/jdennes/contribution-checker/subscribers",
+  "subscription_url": "https://api.github.com/repos/jdennes/contribution-checker/subscription",
+  "commits_url": "https://api.github.com/repos/jdennes/contribution-checker/commits{/sha}",
+  "git_commits_url": "https://api.github.com/repos/jdennes/contribution-checker/git/commits{/sha}",
+  "comments_url": "https://api.github.com/repos/jdennes/contribution-checker/comments{/number}",
+  "issue_comment_url": "https://api.github.com/repos/jdennes/contribution-checker/issues/comments/{number}",
+  "contents_url": "https://api.github.com/repos/jdennes/contribution-checker/contents/{+path}",
+  "compare_url": "https://api.github.com/repos/jdennes/contribution-checker/compare/{base}...{head}",
+  "merges_url": "https://api.github.com/repos/jdennes/contribution-checker/merges",
+  "archive_url": "https://api.github.com/repos/jdennes/contribution-checker/{archive_format}{/ref}",
+  "downloads_url": "https://api.github.com/repos/jdennes/contribution-checker/downloads",
+  "issues_url": "https://api.github.com/repos/jdennes/contribution-checker/issues{/number}",
+  "pulls_url": "https://api.github.com/repos/jdennes/contribution-checker/pulls{/number}",
+  "milestones_url": "https://api.github.com/repos/jdennes/contribution-checker/milestones{/number}",
+  "notifications_url": "https://api.github.com/repos/jdennes/contribution-checker/notifications{?since,all,participating}",
+  "labels_url": "https://api.github.com/repos/jdennes/contribution-checker/labels{/name}",
+  "releases_url": "https://api.github.com/repos/jdennes/contribution-checker/releases{/id}",
+  "created_at": "2014-06-05T08:16:43Z",
+  "updated_at": "2014-06-08T22:47:25Z",
+  "pushed_at": "2014-06-08T22:47:22Z",
+  "git_url": "git://github.com/jdennes/contribution-checker.git",
+  "ssh_url": "[email protected]:jdennes/contribution-checker.git",
+  "clone_url": "https://github.com/jdennes/contribution-checker.git",
+  "svn_url": "https://github.com/jdennes/contribution-checker",
+  "homepage": "",
+  "size": 0,
+  "stargazers_count": 0,
+  "watchers_count": 0,
+  "language": "Ruby",
+  "has_issues": true,
+  "has_downloads": true,
+  "has_wiki": false,
+  "forks_count": 0,
+  "mirror_url": null,
+  "open_issues_count": 0,
+  "forks": 0,
+  "open_issues": 0,
+  "watchers": 0,
+  "default_branch": "master",
+  "permissions": {
+    "admin": true,
+    "push": true,
+    "pull": true
+  },
+  "network_count": 0,
+  "subscribers_count": 2
+}