Commit 3175438f authored by Douwe Maan's avatar Douwe Maan
Browse files

Fix missing GitHub organisation repositories on import page.

parent 82bb3ec3
......@@ -44,6 +44,7 @@ v 7.9.0 (unreleased)
- Wrap commit message in EmailsOnPush email.
- Send EmailsOnPush emails when deleting commits using force push.
- Fix EmailsOnPush email comparison link to include first commit.
- Fix missing GitHub organisation repositories on import page.
v 7.8.2
- Fix service migration issue when upgrading from versions prior to 7.3
......
......@@ -14,7 +14,7 @@ def callback
def status
@repos = client.repos
client.orgs.each do |org|
@repos += client.repos(org.login)
@repos += client.org_repos(org.login)
end
@already_added_projects = current_user.created_projects.where(import_type: "github")
......
......@@ -27,17 +27,20 @@
describe "GET status" do
before do
@repo = OpenStruct.new(login: 'vim', full_name: 'asd/vim')
@org = OpenStruct.new(login: 'company')
@org_repo = OpenStruct.new(login: 'company', full_name: 'company/repo')
end
it "assigns variables" do
@project = create(:project, import_type: 'github', creator_id: user.id)
controller.stub_chain(:client, :repos).and_return([@repo])
controller.stub_chain(:client, :orgs).and_return([])
controller.stub_chain(:client, :orgs).and_return([@org])
controller.stub_chain(:client, :org_repos).with(@org.login).and_return([@org_repo])
get :status
expect(assigns(:already_added_projects)).to eq([@project])
expect(assigns(:repos)).to eq([@repo])
expect(assigns(:repos)).to eq([@repo, @org_repo])
end
it "does not show already added project" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment