diff options
| author | Desiree Chevalier <dchevalier@gitlab.com> | 2019-06-24 09:11:36 -0400 |
|---|---|---|
| committer | Desiree Chevalier <dchevalier@gitlab.com> | 2019-07-15 11:05:36 -0400 |
| commit | 8fbdbbb88f3ebfd805ead75befcc502bc1870013 (patch) | |
| tree | d93442ff17031e56b95289271450108196929271 | |
| parent | a1c2fb2b61d45bf396d7ec97879fd86b206ef618 (diff) | |
| download | gitlab-ce-8fbdbbb88f3ebfd805ead75befcc502bc1870013.tar.gz | |
Code review changes
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 8255a3ee70c..edf1ce932f1 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -193,12 +193,12 @@ parallel-spec-reports: when: always paths: - qa/report-new.html - - qa/gitlab-qa-run-*/**/qa-test-*/ + - qa/gitlab-qa-run-* reports: junit: qa/gitlab-qa-run-*/**/rspec-*.xml script: - - apk add --update build-base libxml2-dev libxslt-dev postgresql-dev && rm -rf /var/cache/apk/* - - gem install nokogiri -- --use-system-libraries + - apk add --update build-base libxml2-dev libxslt-dev && rm -rf /var/cache/apk/* + - gem install nokogiri - '[[ -f $NEW_PARALLEL_SPECS_REPORT ]] || echo "{}" > ${NEW_PARALLEL_SPECS_REPORT}' - scripts/merge-html-reports ${NEW_PARALLEL_SPECS_REPORT} qa/gitlab-qa-run-*/**/rspec.htm diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb index a6f794bff1a..09d1d3fe76e 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb @@ -8,7 +8,7 @@ module QA Page::Main::Login.act { sign_in_using_credentials } Page::Main::Menu.perform do |menu| - expect(menu).not_to have_personal_area + expect(menu).to have_personal_area end Support::Retrier.retry_until(sleep_interval: 0.5) do |