Merge branch 'main' into ropensci

ropensci-org · Nov 4, 2021 · dc5dc37 · dc5dc37
2 parents 9a202e7 + a558c97
commit dc5dc37
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/lib/github.rb b/app/lib/github.rb
@@ -141,7 +141,7 @@ def get_user(username)
   def add_new_team(org_team_name)
     org_name, team_name = org_team_name.split('/')
     begin
-      new_team = github_client.create_team(org_name, { name: team_name })
+      new_team = github_client.create_team(org_name, { name: team_name, privacy: "closed" })
     rescue Octokit::ClientError => gh_err
       logger.warn("Error trying to create team #{org_team_name}: #{gh_err.message}")
       return false

diff --git a/docs/installation.md b/docs/installation.md
@@ -18,7 +18,7 @@ This will be the user responding to commands in the reviews repo.
   ![GitHub's signup page](./images/signup.png "GitHub's signup page")
 
 
-**2.** Go to `Settings >> Developer settings >> Personal access tokens` and create a new token with at least this scopes: `public_repo`, `repo:invite`, `read:org` and `read:user`. Save that token, it will be your `BUFFY_GH_ACCESS_TOKEN`.
+**2.** Go to `Settings >> Developer settings >> Personal access tokens` and create a new token with at least these scopes: `public_repo`, `repo:invite`, `read:org` and `read:user`. Save that token, it will be your `BUFFY_GH_ACCESS_TOKEN`.
 
   ![Settings >> Developer settings >> Personal access tokens](./images/access_token.png "Settings >> Developer settings >> Personal access tokens")
 

diff --git a/spec/github_spec.rb b/spec/github_spec.rb
@@ -252,7 +252,7 @@
     context "with valid permissions" do
       before do
         allow_any_instance_of(Octokit::Client).to receive(:create_team).
-                                                  with("openjournals", {name: "superusers"}).
+                                                  with("openjournals", {name: "superusers", privacy: "closed"}).
                                                   and_return({status: "201"})
       end
 

diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
@@ -23,6 +23,7 @@ def disable_github_calls_for(responder)
     allow(responder).to receive(:unlabel_issue).and_return(true)
     allow(responder).to receive(:update_issue).and_return(true)
     allow(responder).to receive(:update_comment).and_return(true)
+    allow(responder).to receive(:issue_comment).and_return(true)
     allow(responder).to receive(:close_issue).and_return(nil)
     allow(responder).to receive(:add_collaborator).and_return(true)
     allow(responder).to receive(:add_assignee).and_return(true)