summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-18 14:21:17 +0000
committerRémy Coutable <remy@rymai.me>2018-10-18 14:21:17 +0000
commit4c477ed12c62ff013fc9015fc0f3d6188cf689c4 (patch)
treea8afb3f490dbb09cbbd1501fdb3c6c846bb8a9a2
parent6afcc3992b8848cf075a0f1a31bcc446f86a8765 (diff)
parent280a4b95c00a85bbe593e301ea801b6d77dd4d8d (diff)
downloadgitlab-ce-4c477ed12c62ff013fc9015fc0f3d6188cf689c4.tar.gz
Merge branch 'docs-fix-qa-resource-api-fabrication' into 'master'
[QA] Fix resource API fabrication documentation See merge request gitlab-org/gitlab-ce!22461
-rw-r--r--qa/qa/factory/README.md12
1 files changed, 5 insertions, 7 deletions
diff --git a/qa/qa/factory/README.md b/qa/qa/factory/README.md
index c56c7c43129..10140e39510 100644
--- a/qa/qa/factory/README.md
+++ b/qa/qa/factory/README.md
@@ -254,8 +254,7 @@ module QA
project.name = 'project-to-create-a-shirt'
end
- # Attribute inherited from the Shirt factory if present,
- # or from the Browser UI otherwise (using the block)
+ # Attribute from the Browser UI (using the block)
product :brand do
Page::Shirt::Show.perform do |shirt_show|
shirt_show.fetch_brand_from_page
@@ -347,8 +346,7 @@ module QA
project.name = 'project-to-create-a-shirt'
end
- # Attribute fetched from the API response if present if present,
- # or from the Shirt factory if present,
+ # Attribute fetched from the API response if present,
# or from the Browser UI otherwise (using the block)
product :brand do
Page::Shirt::Show.perform do |shirt_show|
@@ -356,7 +354,7 @@ module QA
end
end
- # Attribute fetched from the API response if present if present,
+ # Attribute fetched from the API response if present,
# or from the Shirt factory if present,
# or a QA::Factory::Product::NoValueError is raised otherwise
product :name
@@ -414,9 +412,9 @@ end
**Notes on attributes precedence:**
- attributes from the API response take precedence over attributes from the
+ Browser UI
+- attributes from the Browser UI take precedence over attributes from the
factory (i.e inherited)
-- attributes from the factory (i.e inherited) take precedence over attributes
- from the Browser UI
- attributes without a value will raise a `QA::Factory::Product::NoValueError` error
## Creating resources in your tests