From 0057ed1e69bc203d82fd3e8dfa6db7ea6a9b1de7 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 13 Dec 2016 17:59:21 +0200
Subject: [PATCH] BB importer: Fixed after code review[ci skip]
---
lib/bitbucket/paginator.rb | 2 +-
spec/lib/bitbucket/collection_spec.rb | 1 +
spec/lib/bitbucket/connection_spec.rb | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/bitbucket/paginator.rb b/lib/bitbucket/paginator.rb
index b38cd99855c..135d0d55674 100644
--- a/lib/bitbucket/paginator.rb
+++ b/lib/bitbucket/paginator.rb
@@ -29,7 +29,7 @@ module Bitbucket
end
def fetch_next_page
- parsed_response = connection.get(next_url, { pagelen: PAGE_LENGTH, sort: :created_on })
+ parsed_response = connection.get(next_url, pagelen: PAGE_LENGTH, sort: :created_on)
Page.new(parsed_response, type)
end
end
diff --git a/spec/lib/bitbucket/collection_spec.rb b/spec/lib/bitbucket/collection_spec.rb
index eeed61b0488..015a7f80e03 100644
--- a/spec/lib/bitbucket/collection_spec.rb
+++ b/spec/lib/bitbucket/collection_spec.rb
@@ -18,6 +18,7 @@ end
describe Bitbucket::Collection do
it "iterates paginator" do
collection = described_class.new(TestPaginator.new)
+
expect(collection.to_a).to match(["result_1_page_1", "result_2_page_1", "result_1_page_2", "result_2_page_2"])
end
end
diff --git a/spec/lib/bitbucket/connection_spec.rb b/spec/lib/bitbucket/connection_spec.rb
index 5242c6fac34..6be681a8b47 100644
--- a/spec/lib/bitbucket/connection_spec.rb
+++ b/spec/lib/bitbucket/connection_spec.rb
@@ -4,7 +4,9 @@ describe Bitbucket::Connection do
describe '#get' do
it 'calls OAuth2::AccessToken::get' do
expect_any_instance_of(OAuth2::AccessToken).to receive(:get).and_return(double(parsed: true))
+
connection = described_class.new({})
+
connection.get('/users')
end
end
@@ -12,6 +14,7 @@ describe Bitbucket::Connection do
describe '#expired?' do
it 'calls connection.expired?' do
expect_any_instance_of(OAuth2::AccessToken).to receive(:expired?).and_return(true)
+
expect(described_class.new({}).expired?).to be_truthy
end
end
@@ -19,7 +22,9 @@ describe Bitbucket::Connection do
describe '#refresh!' do
it 'calls connection.refresh!' do
response = double(token: nil, expires_at: nil, expires_in: nil, refresh_token: nil)
+
expect_any_instance_of(OAuth2::AccessToken).to receive(:refresh!).and_return(response)
+
described_class.new({}).refresh!
end
end
--
GitLab