Skip to content

Commit

Permalink
Move label name out of project, repo
Browse files Browse the repository at this point in the history
  • Loading branch information
cheshire137 committed Nov 26, 2024
1 parent 5b1007c commit 5dc3175
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 27 deletions.
10 changes: 9 additions & 1 deletion lib/project_pull_mover/options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,15 @@ def ignored_option_ids

sig { returns T.nilable(String) }
def failing_test_label
@options[:"failing-test-label"]
return @failing_test_label if defined?(@failing_test_label)
value = @options[:"failing-test-label"]
if value
value = value.strip
if value.size < 1
value = nil
end
end
@failing_test_label = value
end

sig { returns String }
Expand Down
13 changes: 0 additions & 13 deletions lib/project_pull_mover/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,6 @@ def title
end
end

sig { returns(T.nilable(String)) }
def failing_test_label_name
return @failing_test_label_name if defined?(@failing_test_label_name)
result = @options.failing_test_label
if result
result = result.strip
if result.size < 1
result = nil
end
end
@failing_test_label_name = result
end

private

def option_name_for(option_id)
Expand Down
20 changes: 10 additions & 10 deletions lib/project_pull_mover/pull_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def initialize(data, options:, project:, gh_cli:)
end

def set_graphql_data(repo_and_pull_data)
@repo ||= Repository.new(repo_and_pull_data, failing_test_label_name: @project.failing_test_label_name)
@repo ||= Repository.new(repo_and_pull_data)
@gql_data = repo_and_pull_data["pullRequest"] || {}
end

Expand All @@ -41,7 +41,7 @@ def number

sig { returns T.nilable(T::Boolean) }
def has_failing_test_label?
@project.failing_test_label_name && labels.include?(@project.failing_test_label_name)
failing_test_label && labels.include?(failing_test_label)
end

sig { returns T::Array[String] }
Expand Down Expand Up @@ -454,29 +454,29 @@ def should_have_conflicting_status?

sig { returns T.nilable(T::Boolean) }
def should_apply_failing_test_label?
failing_required_builds? && failing_test_label_name && !has_failing_test_label?
failing_required_builds? && failing_test_label && !has_failing_test_label?
end

sig { returns T.nilable(String) }
def apply_label_if_necessary
if should_apply_failing_test_label?
apply_label(label_name: T.must(failing_test_label_name))
return failing_test_label_name
apply_label(label_name: T.must(failing_test_label))
return failing_test_label
end

nil
end

sig { returns T.nilable(T::Boolean) }
def should_remove_failing_test_label?
!failing_required_builds? && failing_test_label_name && has_failing_test_label?
!failing_required_builds? && failing_test_label && has_failing_test_label?
end

sig { returns T.nilable(String) }
def remove_label_if_necessary
if should_remove_failing_test_label?
remove_label(label_name: T.must(failing_test_label_name))
return failing_test_label_name
remove_label(label_name: T.must(failing_test_label))
return failing_test_label
end

nil
Expand Down Expand Up @@ -606,8 +606,8 @@ def load_required_checks
end

sig { returns T.nilable(String) }
def failing_test_label_name
@project.failing_test_label_name
def failing_test_label
@options.failing_test_label
end

sig { returns T::Array[String] }
Expand Down
5 changes: 2 additions & 3 deletions lib/project_pull_mover/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ module ProjectPullMover
class Repository
extend T::Sig

sig { params(gql_data: T::Hash[T.untyped, T.untyped], failing_test_label_name: T.nilable(String)).void }
def initialize(gql_data, failing_test_label_name: nil)
sig { params(gql_data: T::Hash[T.untyped, T.untyped]).void }
def initialize(gql_data)
@gql_data = gql_data
@raw_failing_test_label_name = failing_test_label_name
end

sig { returns String }
Expand Down

0 comments on commit 5dc3175

Please sign in to comment.