From c61c5cf2d973f9a9add71dbe876df42caa8e4bfe Mon Sep 17 00:00:00 2001 From: Mark Lapierre Date: Mon, 26 Nov 2018 10:59:52 -0500 Subject: Update E2E tests for Project overview UI changes Includes updates to how clone URLs are accessed. --- qa/qa/resource/project.rb | 6 ++---- qa/qa/resource/repository/project_push.rb | 16 ++-------------- 2 files changed, 4 insertions(+), 18 deletions(-) (limited to 'qa/qa/resource') 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 -- cgit v1.2.1 From ed75b46cd9ae2fbc4dfd98447d659c771ddef23c Mon Sep 17 00:00:00 2001 From: Mark Lapierre Date: Wed, 28 Nov 2018 15:23:38 -0500 Subject: Update tests and Resources to use new file button The 'Create new' dropdown is no longer available on a blank project so use the 'New file' button instead. --- qa/qa/resource/file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qa/qa/resource') 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) -- cgit v1.2.1