diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 21:08:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 21:08:05 +0300 |
commit | f32a580aa1560a8beaec6a8640077cc50a6ed904 (patch) | |
tree | e3e14009292099c29744c9ce7e5cd6b3d869c665 /qa | |
parent | a5ab3467a705b62911feacc3cf627fdbb00aa198 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/project/issue/index.rb | 3 | ||||
-rw-r--r-- | qa/qa/resource/issue.rb | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb index ece49ae80c4..b5ad63ab8de 100644 --- a/qa/qa/page/project/issue/index.rb +++ b/qa/qa/page/project/issue/index.rb @@ -10,6 +10,7 @@ module QA end view 'app/views/projects/issues/_issue.html.haml' do + element :issue element :issue_link, 'link_to issue.title' # rubocop:disable QA/ElementWithPattern end @@ -38,7 +39,7 @@ module QA end def has_issue?(issue) - has_element? :issue, issue_title: issue.to_s + has_element? :issue, issue_title: issue.title end end end diff --git a/qa/qa/resource/issue.rb b/qa/qa/resource/issue.rb index 3bcff6a10ac..0817a9de06f 100644 --- a/qa/qa/resource/issue.rb +++ b/qa/qa/resource/issue.rb @@ -38,10 +38,6 @@ module QA end end - def to_s - @title - end - def api_get_path "/projects/#{project.id}/issues/#{id}" end |