summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2018-12-20 08:27:08 -0500
committerMark Lapierre <mlapierre@gitlab.com>2018-12-20 08:48:10 -0500
commitcbfc00a1e554ed5faf6f5651ef2cb5997f8f384e (patch)
tree1e8d35dc47651cb5a1babe3865d38ce49c1540c8
parent24c9e1e2a85651cd5e446c1f848dad64f3981493 (diff)
downloadgitlab-ce-cbfc00a1e554ed5faf6f5651ef2cb5997f8f384e.tar.gz
Backport page object changes from EE
Add new page object methods from EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8937
-rw-r--r--qa/qa/page/base.rb4
-rw-r--r--qa/qa/support/page/logging.rb8
-rw-r--r--qa/spec/page/logging_spec.rb7
3 files changed, 19 insertions, 0 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index 88ade66f47d..d6b763ed5fc 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -112,6 +112,10 @@ module QA
has_css?(element_selector_css(name))
end
+ def has_no_text?(text)
+ page.has_no_text? text
+ end
+
def within_element(name)
page.within(element_selector_css(name)) do
yield
diff --git a/qa/qa/support/page/logging.rb b/qa/qa/support/page/logging.rb
index 43bc16d8c9a..5765a8041cc 100644
--- a/qa/qa/support/page/logging.rb
+++ b/qa/qa/support/page/logging.rb
@@ -85,6 +85,14 @@ module QA
found
end
+ def has_no_text?(text)
+ found = super
+
+ log(%Q{has_no_text?('#{text}') returned #{found}})
+
+ found
+ end
+
def within_element(name)
log("within element :#{name}")
diff --git a/qa/spec/page/logging_spec.rb b/qa/spec/page/logging_spec.rb
index 9d56353062b..a54ff424f53 100644
--- a/qa/spec/page/logging_spec.rb
+++ b/qa/spec/page/logging_spec.rb
@@ -65,6 +65,13 @@ describe QA::Support::Page::Logging do
.to output(/has_element\? :element returned true/).to_stdout_from_any_process
end
+ it 'logs has_no_text?' do
+ allow(page).to receive(:has_no_text?).with('foo').and_return(true)
+
+ expect { subject.has_no_text? 'foo' }
+ .to output(/has_no_text\?\('foo'\) returned true/).to_stdout_from_any_process
+ end
+
it 'logs within_element' do
expect { subject.within_element(:element) }
.to output(/within element :element/).to_stdout_from_any_process