Skip to content
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :test do
gem "climate_control", "~> 1.2.0"
gem "oj", "~> 3.14" if ENV["WITH_OJ_GEM"] == "true"
gem "rspec", "~> 3.13.0"
gem "rubocop", "~> 1.78.0"
gem "rubocop", "~> 1.79.2"
gem "rubocop-performance", "~> 1.26.0"
gem "simplecov", "~> 0.22.0"
gem "simplecov-console", "~> 0.9.1"
Expand Down
2 changes: 1 addition & 1 deletion allure-ruby-commons/lib/allure_ruby_commons/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def initialize
#
# @return [String]
def environment
return(@environment) if defined?(@environment)
return @environment if defined?(@environment)

@environment ||= ENV["ALLURE_ENVIRONMENT"]
end
Expand Down
8 changes: 4 additions & 4 deletions allure-ruby-commons/spec/unit/allure_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def lifecycle

aggregate_failures do
expect(label).to eq(Allure::Label.new("epic", "Test Epic"))
expect(labels.count { |it| it.name == "epic" }).to eq(1)
expect(labels.count { |label| label.name == "epic" }).to eq(1)
end
end

Expand All @@ -49,7 +49,7 @@ def lifecycle

aggregate_failures do
expect(label).to eq(Allure::Label.new("feature", "Test Feature"))
expect(labels.count { |it| it.name == "feature" }).to eq(1)
expect(labels.count { |label| label.name == "feature" }).to eq(1)
end
end

Expand All @@ -59,7 +59,7 @@ def lifecycle

aggregate_failures do
expect(label).to eq(Allure::Label.new("story", "Test Story"))
expect(labels.count { |it| it.name == "story" }).to eq(1)
expect(labels.count { |label| label.name == "story" }).to eq(1)
end
end

Expand All @@ -69,7 +69,7 @@ def lifecycle

aggregate_failures do
expect(label).to eq(Allure::Label.new("suite", "Test Suite"))
expect(labels.count { |it| it.name == "suite" }).to eq(1)
expect(labels.count { |label| label.name == "suite" }).to eq(1)
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/task_helpers/simplecov_merger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def groups
end

def multiformatter
[SimpleCov::Formatter::Console].yield_self do |formatters|
[SimpleCov::Formatter::Console].then do |formatters|
formatters << SimpleCov::Formatter::HTMLFormatter if ENV["COV_HTML_REPORT"]
formatters << SimpleCov::Formatter::JSONFormatter if ENV["CC_TEST_REPORTER_ID"]
SimpleCov::Formatter::MultiFormatter.new(formatters)
Expand Down