Commit 021744ae authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 35d3739b 3de934cb
......@@ -53,7 +53,14 @@ module QA
Page::Main::Login.perform { |login| login.sign_in_using_credentials(@user) }
end
Resource::PersonalAccessToken.fabricate!.access_token
token = Resource::PersonalAccessToken.fabricate!.access_token
# If this is a new session, that tests that follow could fail if they
# try to sign in without starting a new session
# Sign out so the tests can successfully sign in
Page::Main::Menu.perform(&:sign_out) if @is_new_session
token
end
end
end
......
......@@ -21,7 +21,6 @@ module QA
user_info[:api_client] = Runtime::API::Client.new(:gitlab, user: user_info[:user])
user_info[:api_client].personal_access_token
user_info[:project] = create_project(user_info[:user], user_info[:api_client], @project_name)
Page::Main::Menu.perform(&:sign_out)
end
end
......@@ -43,7 +42,7 @@ module QA
end
def create_project(user, api_client, project_name)
project = Resource::Project.fabricate! do |project|
project = Resource::Project.fabricate_via_api! do |project|
project.standalone = true
project.add_name_uuid = false
project.name = project_name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment