summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-05-18 08:27:17 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-05-18 08:27:17 +0000
commit769c4a6197dfd72aca06abd20fa1ffe5c568ed24 (patch)
tree88f191e0d5c4ef1105832c938fd3c36a905a11ff
parent9f058e9ab10051720faa6bcce4b18b3ba86ebad5 (diff)
parent368697ecf343c51db4f1a36372a2aa1ce5f950a3 (diff)
downloadgitlab-ce-769c4a6197dfd72aca06abd20fa1ffe5c568ed24.tar.gz
Merge branch 'qa-245' into 'master'
Loosen the matcher in the MR creation test Closes gitlab-qa#245 See merge request gitlab-org/gitlab-ce!19012
-rw-r--r--qa/qa/specs/features/merge_request/create_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/specs/features/merge_request/create_spec.rb b/qa/qa/specs/features/merge_request/create_spec.rb
index fbf9a4d17e5..0931e649e24 100644
--- a/qa/qa/specs/features/merge_request/create_spec.rb
+++ b/qa/qa/specs/features/merge_request/create_spec.rb
@@ -11,7 +11,7 @@ module QA
expect(page).to have_content('This is a merge request')
expect(page).to have_content('Great feature')
- expect(page).to have_content('Opened less than a minute ago')
+ expect(page).to have_content(/Opened [\w\s]+ a minute ago/)
end
end
end