diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-09 12:20:39 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-09 12:20:39 +0100 |
commit | 170c07ef677d45edf93411f6c5a396b93e0def3f (patch) | |
tree | 0ad728950155e25997d0c1bc40c2ec21e3f004c9 | |
parent | fa07d232247e0ae393bb692676fcd6b3f1f0e5c2 (diff) | |
download | gitlab-ce-170c07ef677d45edf93411f6c5a396b93e0def3f.tar.gz |
Fix QA pages validation delegation and memoization
-rw-r--r-- | qa/qa/page/base.rb | 2 | ||||
-rw-r--r-- | qa/qa/page/validator.rb | 10 | ||||
-rw-r--r-- | qa/qa/scenario/test/sanity/selectors.rb | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb index ba1323eb215..05e300820fa 100644 --- a/qa/qa/page/base.rb +++ b/qa/qa/page/base.rb @@ -53,7 +53,7 @@ module QA return ["#{name} class does not have views / elements defined!"] end - @errors ||= views.map(&:errors).flatten + views.map(&:errors).flatten end class DSL diff --git a/qa/qa/page/validator.rb b/qa/qa/page/validator.rb index 88d083f5d97..953a137ec34 100644 --- a/qa/qa/page/validator.rb +++ b/qa/qa/page/validator.rb @@ -2,7 +2,7 @@ module QA module Page class Validator ValidationError = Class.new(StandardError) - Error = Struct.new(:page, :view, :message) + Error = Struct.new(:page, :message) def initialize(constant) @module = constant @@ -28,12 +28,10 @@ module QA end def errors - @errors ||= Array.new.tap do |errors| + Array.new.tap do |errors| descendants.each do |page| - page.views.each do |view| - view.errors.each do |message| - errors.push(Error.new(page.name, view.path, message)) - end + page.errors.each do |message| + errors.push(Error.new(page.name, message)) end end end diff --git a/qa/qa/scenario/test/sanity/selectors.rb b/qa/qa/scenario/test/sanity/selectors.rb index c6ede07680a..62dd47bc0ad 100644 --- a/qa/qa/scenario/test/sanity/selectors.rb +++ b/qa/qa/scenario/test/sanity/selectors.rb @@ -13,7 +13,6 @@ module QA end validators.map(&:errors).flatten.tap do |errors| - end validators.each(&:validate!) |