summaryrefslogtreecommitdiff
path: root/qa/qa/resource
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-11 12:47:41 +0000
committerRémy Coutable <remy@rymai.me>2018-12-11 12:47:41 +0000
commit1d87276cddbc083c6b5536faf6fdce6c84cc844f (patch)
tree3a804b4151d7dc911aba726440feff35548f40d2 /qa/qa/resource
parent7e4fcfb04c70604a8d9c2fade167bb04fc8f1d28 (diff)
parent7aeddde12853e427a53f1c8220668cc860726e1d (diff)
downloadgitlab-ce-1d87276cddbc083c6b5536faf6fdce6c84cc844f.tar.gz
Merge branch 'qa-project-ui-updates' into 'master'
Update E2E tests to account for Project overview UI changes See merge request gitlab-org/gitlab-ce!23366
Diffstat (limited to 'qa/qa/resource')
-rw-r--r--qa/qa/resource/file.rb2
-rw-r--r--qa/qa/resource/project.rb6
-rw-r--r--qa/qa/resource/repository/project_push.rb16
3 files changed, 5 insertions, 19 deletions
diff --git a/qa/qa/resource/file.rb b/qa/qa/resource/file.rb
index effc5a7940b..57e82ac19ad 100644
--- a/qa/qa/resource/file.rb
+++ b/qa/qa/resource/file.rb
@@ -22,7 +22,7 @@ module QA
def fabricate!
project.visit!
- Page::Project::Show.perform(&:create_new_file!)
+ Page::Project::Show.perform(&:create_first_new_file!)
Page::File::Form.perform do |page|
page.add_name(@name)
diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb
index 7fdf69278f9..1fafbf5d73e 100644
--- a/qa/qa/resource/project.rb
+++ b/qa/qa/resource/project.rb
@@ -14,15 +14,13 @@ module QA
attribute :repository_ssh_location do
Page::Project::Show.perform do |page|
- page.choose_repository_clone_ssh
- page.repository_location
+ page.repository_clone_ssh_location
end
end
attribute :repository_http_location do
Page::Project::Show.perform do |page|
- page.choose_repository_clone_http
- page.repository_location
+ page.repository_clone_http_location
end
end
diff --git a/qa/qa/resource/repository/project_push.rb b/qa/qa/resource/repository/project_push.rb
index c9fafe3419f..37feab4ad70 100644
--- a/qa/qa/resource/repository/project_push.rb
+++ b/qa/qa/resource/repository/project_push.rb
@@ -20,23 +20,11 @@ module QA
end
def repository_http_uri
- @repository_http_uri ||= begin
- project.visit!
- Page::Project::Show.act do
- choose_repository_clone_http
- repository_location.uri
- end
- end
+ @repository_http_uri ||= project.repository_http_location.uri
end
def repository_ssh_uri
- @repository_ssh_uri ||= begin
- project.visit!
- Page::Project::Show.act do
- choose_repository_clone_ssh
- repository_location.uri
- end
- end
+ @repository_ssh_uri ||= project.repository_ssh_location.uri
end
end
end