Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rubocop config and fix/ignore new violations #83

Merged
merged 1 commit into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,12 @@ source 'https://rubygems.org'

# See companies-house.gemspec
gemspec

# Development dependencies
gem "activesupport", ">= 4.2", "< 7"
gem "gc_ruboconfig", "~> 5.0"
gem "rake", "~> 13.0"
gem "rspec", "~> 3.5"
gem "rspec_junit_formatter", "~> 0.4.1"
gem "timecop", "~> 0.8"
gem "webmock", "~> 3.0"
9 changes: 1 addition & 8 deletions companies-house-rest.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]
spec.required_ruby_version = ">= 3.0.2"

spec.add_runtime_dependency "dry-struct", "~> 1"
spec.add_dependency "dry-struct", "~> 1"

spec.add_development_dependency "activesupport", ">= 4.2", "< 7"
spec.add_development_dependency "gc_ruboconfig", "~> 3.6"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rspec", "~> 3.5"
spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
spec.add_development_dependency "timecop", "~> 0.8"
spec.add_development_dependency "webmock", "~> 3.0"
spec.metadata["rubygems_mfa_required"] = "true"
end
2 changes: 1 addition & 1 deletion lib/companies_house/request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Request < Dry::Struct
attribute :instrumentation, Dry.Types.Interface(:publish)

def initialize(args)
super(args)
super

@uri = URI.join(endpoint, path)
@uri.query = URI.encode_www_form(query)
Expand Down
2 changes: 1 addition & 1 deletion lib/companies_house/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module CompaniesHouse
VERSION = "1.0.0"
VERSION = "1.0.1"
end
94 changes: 26 additions & 68 deletions spec/companies_house/client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@
describe CompaniesHouse::Client do
before { WebMock.disable_net_connect! }

shared_context "multiple pages" do
# rubocop:disable RSpec/IndexedLet
let(:page1) do
{
items_per_page: 1,
total_results: 2,
start_index: 0,
items: ["item1"],
}.to_json
end

let(:page2) do
{
items_per_page: 1,
total_results: 2,
start_index: 1,
items: ["item2"],
}.to_json
end
# rubocop:enable RSpec/IndexedLet
end

describe "#initialize" do
include_context "test credentials"
describe "with an API key" do
Expand Down Expand Up @@ -142,23 +164,7 @@
end

context "when results are spread across several pages" do
let(:page1) do
{
items_per_page: 1,
total_results: 2,
start_index: 0,
items: ["item1"],
}.to_json
end

let(:page2) do
{
items_per_page: 1,
total_results: 2,
start_index: 1,
items: ["item2"],
}.to_json
end
include_context "multiple pages"

before do
stub_request(:get, "#{example_endpoint}/#{rest_path}").
Expand Down Expand Up @@ -268,23 +274,7 @@
end

context "when results are spread across several pages" do
let(:page1) do
{
items_per_page: 1,
total_results: 2,
start_index: 0,
items: ["item1"],
}.to_json
end

let(:page2) do
{
items_per_page: 1,
total_results: 2,
start_index: 1,
items: ["item2"],
}.to_json
end
include_context "multiple pages"

before do
stub_request(:get, "#{example_endpoint}/#{rest_path}").
Expand Down Expand Up @@ -354,23 +344,7 @@
end

context "when results are spread across several pages" do
let(:page1) do
{
items_per_page: 1,
total_results: 2,
start_index: 0,
items: ["item1"],
}.to_json
end

let(:page2) do
{
items_per_page: 1,
total_results: 2,
start_index: 1,
items: ["item2"],
}.to_json
end
include_context "multiple pages"

before do
stub_request(:get, "#{example_endpoint}/#{rest_path}").
Expand Down Expand Up @@ -517,23 +491,7 @@
end

context "when results are spread across several pages" do
let(:page1) do
{
items_per_page: 1,
total_results: 2,
start_index: 0,
items: ["item1"],
}.to_json
end

let(:page2) do
{
items_per_page: 1,
total_results: 2,
start_index: 1,
items: ["item2"],
}.to_json
end
include_context "multiple pages"

before do
stub_request(:get, "#{example_endpoint}/#{rest_path}").
Expand Down
Loading