diff options
author | Brett Walker <bwalker@gitlab.com> | 2018-01-10 18:13:34 +0100 |
---|---|---|
committer | Brett Walker <bwalker@gitlab.com> | 2018-01-22 17:25:10 +0100 |
commit | d883b95548541665fe3d81c6f79884dc19700cdc (patch) | |
tree | 27def76f5a4b79b705f3cee6ee726932be292009 | |
parent | c14b56cc6fe0cb0084c6a476d108806eb3145818 (diff) | |
download | gitlab-ce-d883b95548541665fe3d81c6f79884dc19700cdc.tar.gz |
use module Profile instead of UserSettings
-rw-r--r-- | qa/qa.rb | 8 | ||||
-rw-r--r-- | qa/qa/factory/resource/personal_access_token.rb | 32 | ||||
-rw-r--r-- | qa/qa/page/menu/profile.rb (renamed from qa/qa/page/menu/user_settings.rb) | 2 | ||||
-rw-r--r-- | qa/qa/page/profile/personal_access_tokens.rb | 23 | ||||
-rw-r--r-- | qa/qa/page/user/settings/access_tokens.rb | 25 |
5 files changed, 43 insertions, 47 deletions
@@ -87,7 +87,7 @@ module QA autoload :Main, 'qa/page/menu/main' autoload :Side, 'qa/page/menu/side' autoload :Admin, 'qa/page/menu/admin' - autoload :UserSettings, 'qa/page/menu/user_settings' + autoload :Profile, 'qa/page/menu/profile' end module Dashboard @@ -111,10 +111,8 @@ module QA end end - module User - module Settings - autoload :AccessTokens, 'qa/page/user/settings/access_tokens' - end + module Profile + autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens' end module Admin diff --git a/qa/qa/factory/resource/personal_access_token.rb b/qa/qa/factory/resource/personal_access_token.rb index 46c3c544683..949106cd80a 100644 --- a/qa/qa/factory/resource/personal_access_token.rb +++ b/qa/qa/factory/resource/personal_access_token.rb @@ -9,25 +9,25 @@ module QA def fabricate!(sign_in_address = :gitlab) @access_token = Runtime::Env.personal_access_token - unless @access_token - if sign_in_address - Runtime::Browser.visit(sign_in_address, Page::Main::Login) - Page::Main::Login.act { sign_in_using_credentials } - end + return if @access_token - Page::Menu::Main.act { go_to_profile_settings } - Page::Menu::UserSettings.act { click_access_tokens } + if sign_in_address + Runtime::Browser.visit(sign_in_address, Page::Main::Login) + Page::Main::Login.act { sign_in_using_credentials } + end + + Page::Menu::Main.act { go_to_profile_settings } + Page::Menu::Profile.act { click_access_tokens } - Page::User::Settings::AccessTokens.perform do |page| - page.fill_token_name(name || 'api-test-token') - page.check_api - page.create_token - @access_token = page.created_access_token - end + Page::Profile::PersonalAccessTokens.perform do |page| + page.fill_token_name(name || 'api-test-token') + page.check_api + page.create_token + @access_token = page.created_access_token + end - if sign_in_address - Page::Menu::Main.act { sign_out } - end + if sign_in_address + Page::Menu::Main.act { sign_out } end end end diff --git a/qa/qa/page/menu/user_settings.rb b/qa/qa/page/menu/profile.rb index 00d73ae6919..ce72d473ac7 100644 --- a/qa/qa/page/menu/user_settings.rb +++ b/qa/qa/page/menu/profile.rb @@ -1,7 +1,7 @@ module QA module Page module Menu - class UserSettings < Page::Base + class Profile < Page::Base def click_access_tokens within_sidebar do click_link('Access Tokens') diff --git a/qa/qa/page/profile/personal_access_tokens.rb b/qa/qa/page/profile/personal_access_tokens.rb new file mode 100644 index 00000000000..ac43b356d70 --- /dev/null +++ b/qa/qa/page/profile/personal_access_tokens.rb @@ -0,0 +1,23 @@ +module QA + module Page + module Profile + class PersonalAccessTokens < Page::Base + def fill_token_name(name) + fill_in 'personal_access_token_name', with: name + end + + def check_api + check 'personal_access_token_scopes_api' + end + + def create_token + click_on 'Create personal access token' + end + + def created_access_token + page.find('#created-personal-access-token').value + end + end + end + end +end diff --git a/qa/qa/page/user/settings/access_tokens.rb b/qa/qa/page/user/settings/access_tokens.rb deleted file mode 100644 index 3171a47b678..00000000000 --- a/qa/qa/page/user/settings/access_tokens.rb +++ /dev/null @@ -1,25 +0,0 @@ -module QA - module Page - module User - module Settings - class AccessTokens < Page::Base - def fill_token_name(name) - fill_in 'personal_access_token_name', with: name - end - - def check_api - check 'personal_access_token_scopes_api' - end - - def create_token - click_on 'Create personal access token' - end - - def created_access_token - page.find('#created-personal-access-token').value - end - end - end - end - end -end |