Skip to content

Commit

Permalink
[frontend] Fix Layout/IndentHash offenses
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidKang committed Dec 18, 2017
1 parent 38ba8d1 commit fa92e5f
Show file tree
Hide file tree
Showing 31 changed files with 185 additions and 194 deletions.
7 changes: 0 additions & 7 deletions .rubocop_todo.yml
Expand Up @@ -13,13 +13,6 @@
Layout/DotPosition:
Enabled: false

# Offense count: 88
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: special_inside_parentheses, consistent, align_braces
Layout/IndentHash:
Enabled: false

# Offense count: 66
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/controllers/webui/package_controller.rb
Expand Up @@ -529,8 +529,8 @@ def branch
end

branch_params = {
project: source_project_name,
package: source_package_name
project: source_project_name,
package: source_package_name
}

# Set the branch to the current revision if revision is present
Expand Down
10 changes: 5 additions & 5 deletions src/api/app/controllers/webui/request_controller.rb
Expand Up @@ -298,11 +298,11 @@ def change_devel_request
BsRequest.transaction do
req = BsRequest.new(state: "new", description: params[:description])
action = BsRequestActionChangeDevel.new({
target_project: params[:project],
target_package: params[:package],
source_project: params[:devel_project],
source_package: params[:devel_package] || params[:package]
})
target_project: params[:project],
target_package: params[:package],
source_project: params[:devel_project],
source_package: params[:devel_package] || params[:package]
})

req.bs_request_actions << action
action.bs_request = req
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/helpers/webui/project_helper.rb
Expand Up @@ -104,9 +104,9 @@ def remove_parent_name(project_name, parent_name)
end

STATE_ICONS = {
'new' => 'flag_green',
'review' => 'flag_yellow',
'declined' => 'flag_red'
'new' => 'flag_green',
'review' => 'flag_yellow',
'declined' => 'flag_red'
}.freeze

def map_request_state_to_flag(state)
Expand Down
16 changes: 8 additions & 8 deletions src/api/app/models/bs_request.rb
Expand Up @@ -1002,8 +1002,8 @@ def apply_default_reviewers
reviewers += action.default_reviewers

action.create_post_permissions_hook({
per_package_locking: @per_package_locking
})
per_package_locking: @per_package_locking
})
end

# apply reviewers
Expand Down Expand Up @@ -1187,12 +1187,12 @@ def check_bs_request_actions!(opts = {})
return unless persisted? && priority_changed?

HistoryElement::RequestPriorityChange.create({
request: self,
# We need to have a user here
user: User.find_nobody!,
description_extension: "#{priority_was} => #{priority}",
comment: "Automatic priority bump: Priority of related action increased."
})
request: self,
# We need to have a user here
user: User.find_nobody!,
description_extension: "#{priority_was} => #{priority}",
comment: "Automatic priority bump: Priority of related action increased."
})
end

def _assignreview_update_reviews(reviewer, opts, new_review = nil)
Expand Down
12 changes: 6 additions & 6 deletions src/api/app/models/bs_request/data_table/params_parser.rb
Expand Up @@ -42,12 +42,12 @@ def order_params
def sort_columns
# defaults to :created_at
{
0 => %w(bs_requests.created_at),
1 => %w(bs_request_actions.source_project bs_request_actions.source_package),
2 => %w(bs_request_actions.target_project bs_request_actions.target_package),
3 => %w(bs_requests.creator),
4 => %w(bs_request_actions.type),
5 => %w(bs_requests.priority)
0 => %w(bs_requests.created_at),
1 => %w(bs_request_actions.source_project bs_request_actions.source_package),
2 => %w(bs_request_actions.target_project bs_request_actions.target_package),
3 => %w(bs_requests.creator),
4 => %w(bs_request_actions.type),
5 => %w(bs_requests.priority)
}[order_params.fetch(:column, nil).to_i]
end

Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/bs_request_action.rb
Expand Up @@ -54,8 +54,8 @@ class VersionReleaseDiffers < APIException; end
validates :sourceupdate, inclusion: { in: VALID_SOURCEUPDATE_OPTIONS, allow_nil: true }
validate :check_sanity
validates :type, uniqueness: {
scope: [:target_project, :target_package, :bs_request_id],
conditions: -> { where.not(type: ['add_role', 'maintenance_incident']) }
scope: [:target_project, :target_package, :bs_request_id],
conditions: -> { where.not(type: ['add_role', 'maintenance_incident']) }
}

before_validation :set_target_associations
Expand Down
38 changes: 19 additions & 19 deletions src/api/app/models/buildresult.rb
Expand Up @@ -18,25 +18,25 @@ class Buildresult < ActiveXML::Node
}.freeze

STATUS_DESCRIPTION = {
succeeded: "Package has built successfully and can be used to build further packages.",
failed: "The package does not build successfully. No packages have been created. Packages " +
"that depend on this package will be built using any previously created packages, if they exist.",
unresolvable: "The build can not begin, because required packages are either missing or not explicitly defined.",
broken: "The sources either contain no build description (e.g. specfile), automatic source processing failed or a " +
"merge conflict does exist.",
blocked: "This package waits for other packages to be built. These can be in the same or other projects.",
scheduled: "A package has been marked for building, but the build has not started yet.",
dispatching: "A package is being copied to a build host. This is an intermediate state before building.",
building: "The package is currently being built.",
signing: "The package has been built successfully and is assigned to get signed.",
finished: "The package has been built and signed, but has not yet been picked up by the scheduler. This is an " +
"intermediate state prior to 'succeeded' or 'failed'.",
disabled: "The package has been disabled from building in project or package metadata. " +
"Packages that depend on this package will be built using any previously created packages, if they still exist.",
excluded: "The package build has been disabled in package build description (for example in the .spec file) or " +
"does not provide a matching build description for the target.",
locked: "The package is frozen",
unknown: "The scheduler has not yet evaluated this package. Should be a short intermediate state for new packages."
succeeded: "Package has built successfully and can be used to build further packages.",
failed: "The package does not build successfully. No packages have been created. Packages " +
"that depend on this package will be built using any previously created packages, if they exist.",
unresolvable: "The build can not begin, because required packages are either missing or not explicitly defined.",
broken: "The sources either contain no build description (e.g. specfile), automatic source processing failed or a " +
"merge conflict does exist.",
blocked: "This package waits for other packages to be built. These can be in the same or other projects.",
scheduled: "A package has been marked for building, but the build has not started yet.",
dispatching: "A package is being copied to a build host. This is an intermediate state before building.",
building: "The package is currently being built.",
signing: "The package has been built successfully and is assigned to get signed.",
finished: "The package has been built and signed, but has not yet been picked up by the scheduler. This is an " +
"intermediate state prior to 'succeeded' or 'failed'.",
disabled: "The package has been disabled from building in project or package metadata. " +
"Packages that depend on this package will be built using any previously created packages, if they still exist.",
excluded: "The package build has been disabled in package build description (for example in the .spec file) or " +
"does not provide a matching build description for the target.",
locked: "The package is frozen",
unknown: "The scheduler has not yet evaluated this package. Should be a short intermediate state for new packages."
}.with_indifferent_access.freeze

def self.status_description(status)
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/issue.rb
Expand Up @@ -14,9 +14,9 @@ class NotFoundError < APIException

def self.find_or_create_by_name_and_tracker(name, issue_tracker_name, force_update = nil)
find_by_name_and_tracker(name, issue_tracker_name, {
force_update: force_update,
create_missing: true
})
force_update: force_update,
create_missing: true
})
end

def self.find_by_name_and_tracker(name, issue_tracker_name, options = {})
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/project.rb
Expand Up @@ -1583,7 +1583,7 @@ def self.validate_link_xml_attribute(request_data, project_name)
target_project.disabled_for?('access', nil, nil) &&
!FlagHelper.xml_disabled_for?(request_data, 'access')
return {
error: "Project links work only when both projects have same read access protection level: #{project_name} -> #{target_project_name}"
error: "Project links work only when both projects have same read access protection level: #{project_name} -> #{target_project_name}"
}
end
logger.debug "Project #{project_name} link checked against #{target_project_name} projects permission"
Expand Down
12 changes: 6 additions & 6 deletions src/api/app/models/project/update_from_xml_command.rb
Expand Up @@ -304,12 +304,12 @@ def update_download_repositories(current_repo, xml_hash)

dod_repositories = xml_hash.elements("download").map do |dod|
dod_attributes = {
repository: current_repo,
arch: dod["arch"],
url: dod["url"],
repotype: dod["repotype"],
archfilter: dod["archfilter"],
pubkey: dod["pubkey"]
repository: current_repo,
arch: dod["arch"],
url: dod["url"],
repotype: dod["repotype"],
archfilter: dod["archfilter"],
pubkey: dod["pubkey"]
}
if dod["master"]
dod_attributes[:masterurl] = dod["master"]["url"]
Expand Down
2 changes: 1 addition & 1 deletion src/api/lib/backend/connection.rb
Expand Up @@ -37,7 +37,7 @@ def self.put(path, data, in_headers = {})

def self.post(path, data = nil, in_headers = {})
in_headers = {
'Content-Type' => 'application/octet-stream'
'Content-Type' => 'application/octet-stream'
}.merge in_headers
put_or_post("POST", path, data, in_headers)
end
Expand Down
2 changes: 1 addition & 1 deletion src/api/lib/xpath_engine.rb
Expand Up @@ -180,7 +180,7 @@ def initialize
'@email' => { cpart: 'users.email' },
'@realname' => { cpart: 'users.realname' },
'@state' => { cpart: 'users.state' }
},
},
'issues' => {
'@name' => { cpart: 'issues.name' },
'@state' => { cpart: 'issues.state' },
Expand Down
Expand Up @@ -177,7 +177,7 @@
id: kiwi_repository.id,
repo_type: 'apt2-deb',
source_path: 'htt://example.com'
}
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/api/spec/controllers/webui/package_controller_spec.rb
Expand Up @@ -190,8 +190,8 @@
context 'valid data' do
before do
post :save, params: {
project: source_project, package: source_package, title: 'New title for package', description: 'New description for package'
}
project: source_project, package: source_package, title: 'New title for package', description: 'New description for package'
}
end

it { expect(flash[:notice]).to eq("Package data for '#{source_package.name}' was saved successfully") }
Expand All @@ -203,8 +203,8 @@
context 'invalid data' do
before do
post :save, params: {
project: source_project, package: source_package, title: 'New title for package', description: SecureRandom.hex(32768) # = 65536 chars
}
project: source_project, package: source_package, title: 'New title for package', description: SecureRandom.hex(32768) # = 65536 chars
}
end

it { expect(controller).to set_flash[:error] }
Expand Down
20 changes: 10 additions & 10 deletions src/api/spec/controllers/webui/patchinfo_controller_spec.rb
Expand Up @@ -15,10 +15,10 @@

def do_proper_post_save
post :save, params: {
project: user.home_project_name, package: patchinfo_package.name, summary: 'long enough summary is ok',
project: user.home_project_name, package: patchinfo_package.name, summary: 'long enough summary is ok',
description: 'long enough description is also ok' * 5, issueid: [769484], issuetracker: ['bgo'], issuesum: [nil],
issueurl: ['https://bugzilla.gnome.org/show_bug.cgi?id=769484'], category: 'recommended', rating: 'low', packager: user.login
}
}
end

let(:fake_build_results) do
Expand Down Expand Up @@ -156,8 +156,8 @@ def do_proper_post_save
context 'with a short summary' do
before do
post :save, params: {
project: user.home_project_name, package: patchinfo_package.name, summary: 'short', description: 'long description ' * 10
}
project: user.home_project_name, package: patchinfo_package.name, summary: 'short', description: 'long description ' * 10
}
end

it { expect(flash[:error]).to eq("|| Summary is too short (should have more than 10 signs)") }
Expand All @@ -168,8 +168,8 @@ def do_proper_post_save
context 'with a short description' do
before do
post :save, params: {
project: user.home_project_name, package: patchinfo_package.name, summary: 'long enough summary is ok', description: 'short'
}
project: user.home_project_name, package: patchinfo_package.name, summary: 'long enough summary is ok', description: 'short'
}
end

it { expect(flash[:error]).to eq(" || Description is too short (should have more than 50 signs and longer than summary)") }
Expand All @@ -179,10 +179,10 @@ def do_proper_post_save
context 'with an unknown issue tracker' do
before do
post :save, params: {
project: user.home_project_name, package: patchinfo_package.name, summary: 'long enough summary is ok',
project: user.home_project_name, package: patchinfo_package.name, summary: 'long enough summary is ok',
description: 'long enough description is also ok' * 5, issueid: [769484], issuetracker: ['NonExistingTracker'], issuesum: [nil],
issueurl: ['https://bugzilla.gnome.org/show_bug.cgi?id=769484']
}
}
end

it { expect(flash[:error]).to eq("Unknown Issue tracker NonExistingTracker") }
Expand All @@ -192,10 +192,10 @@ def do_proper_post_save
context "when the patchinfo's xml is invalid" do
before do
post :save, params: {
project: user.home_project_name, package: patchinfo_package.name,
project: user.home_project_name, package: patchinfo_package.name,
summary: 'long enough summary is ok', description: 'long enough description is also ok' * 5,
issueid: [769484], issuetracker: ['bgo'], issuesum: [nil], issueurl: ['https://bugzilla.gnome.org/show_bug.cgi?id=769484']
}
}
end

it { expect(flash[:error]).to start_with("patchinfo is invalid: ") }
Expand Down
18 changes: 9 additions & 9 deletions src/api/spec/controllers/webui/project_controller_spec.rb
Expand Up @@ -1438,21 +1438,21 @@
end
let(:statushash) do
{ "openSUSE_Tumbleweed" => {
"i586" => {
"c++" => { "package" => "c++", "code" => "succeeded" },
"redis" => { "package" => "redis", "code" => "failed" }
},
"x86_64" => {
"c++" => { "package" => "c++", "code" => "unresolvable", "details" => "nothing provides foo" },
"redis" => { "package" => "redis", "code" => "building", "details" => "building on obs-node-3" }
}
"i586" => {
"c++" => { "package" => "c++", "code" => "succeeded" },
"redis" => { "package" => "redis", "code" => "failed" }
},
"x86_64" => {
"c++" => { "package" => "c++", "code" => "unresolvable", "details" => "nothing provides foo" },
"redis" => { "package" => "redis", "code" => "building", "details" => "building on obs-node-3" }
}
},
"openSUSE_42.2" => {
"s390x" => {
"c++" => { "package" => "c++", "code" => "succeeded" },
"redis" => { "package" => "redis", "code" => "succeeded" }
}
} }
} }
end

before do
Expand Down
Expand Up @@ -159,9 +159,9 @@
before do
target_repo = create(:repository, project: another_project)
post :create, params: {
project: user.home_project, repository: 'valid_name',
project: user.home_project, repository: 'valid_name',
target_project: another_project, target_repo: target_repo.name, architectures: ['i586']
}
}
end

it { expect(flash[:success]).to eq("Successfully added repository 'valid_name'") }
Expand Down

0 comments on commit fa92e5f

Please sign in to comment.