From a996880bf7d5d94b1bca7be84bd00b18e37da337 Mon Sep 17 00:00:00 2001 From: Gabriel Mazetto Date: Fri, 10 Mar 2017 20:40:14 +0100 Subject: Using guard clause and added more specs --- lib/gitlab/github_import/importer.rb | 4 +++- lib/gitlab/github_import/pull_request_formatter.rb | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index 055a07781a5..eea4a91f17d 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -148,7 +148,7 @@ module Gitlab rescue => e errors << { type: :pull_request, url: Gitlab::UrlSanitizer.sanitize(gh_pull_request.url), errors: e.message } ensure - clean_up_restored_branches(gh_pull_request) unless gh_pull_request.opened? + clean_up_restored_branches(gh_pull_request) end end end @@ -171,6 +171,8 @@ module Gitlab end def clean_up_restored_branches(pull_request) + return if pull_request.opened? + remove_branch(pull_request.source_branch_name) unless pull_request.source_branch_exists? remove_branch(pull_request.target_branch_name) unless pull_request.target_branch_exists? end diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb index 0a31e3888bd..add7236e339 100644 --- a/lib/gitlab/github_import/pull_request_formatter.rb +++ b/lib/gitlab/github_import/pull_request_formatter.rb @@ -64,14 +64,6 @@ module Gitlab state == 'opened' end - def closed? - state == 'closed' - end - - def merged? - state == 'merged' - end - private def state -- cgit v1.2.1