kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Put all menus under menu module

This commit is contained in:
Lin Jen-Shin 2018-01-02 22:09:43 +08:00
parent 7945878d45
commit 1e79ebf044
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/qa.rb
View File

@ -70,12 +70,13 @@ module QA
module Main module Main
autoload :Login, 'qa/page/main/login' autoload :Login, 'qa/page/main/login'
autoload :Menu, 'qa/page/main/menu'
autoload :OAuth, 'qa/page/main/oauth' autoload :OAuth, 'qa/page/main/oauth'
end end
module Menu module Menu
autoload :Main, 'qa/page/menu/main'
autoload :Side, 'qa/page/menu/side' autoload :Side, 'qa/page/menu/side'
autoload :Admin, 'qa/page/menu/admin'
end end
module Dashboard module Dashboard
@ -100,7 +101,6 @@ module QA
end end
module Admin module Admin
autoload :Menu, 'qa/page/admin/menu'
autoload :Settings, 'qa/page/admin/settings' autoload :Settings, 'qa/page/admin/settings'
end end

2
qa/qa/factory/resource/sandbox.rb
View File

@ -11,7 +11,7 @@ module QA
end end
def fabricate! def fabricate!
Page::Main::Menu.act { go_to_groups } Page::Menu::Main.act { go_to_groups }
Page::Dashboard::Groups.perform do |page| Page::Dashboard::Groups.perform do |page|
if page.has_group?(@name) if page.has_group?(@name)

6
qa/qa/factory/settings/hashed_storage.rb
View File

@ -6,15 +6,15 @@ module QA
raise ArgumentError unless traits.include?(:enabled) raise ArgumentError unless traits.include?(:enabled)
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
Page::Main::Menu.act { go_to_admin_area } Page::Menu::Main.act { go_to_admin_area }
Page::Admin::Menu.act { go_to_settings } Page::Menu::Admin.act { go_to_settings }
Page::Admin::Settings.act do Page::Admin::Settings.act do
enable_hashed_storage enable_hashed_storage
save_settings save_settings
end end
QA::Page::Main::Menu.act { sign_out } QA::Page::Menu::Main.act { sign_out }
end end
end end
end end

4
qa/qa/page/admin/menu.rb → qa/qa/page/menu/admin.rb
View File

@ -1,7 +1,7 @@
module QA module QA
module Page module Page
module Admin module Menu
class Menu < Page::Base class Admin < Page::Base
def go_to_license def go_to_license
click_link 'License' click_link 'License'
end end

4
qa/qa/page/main/menu.rb → qa/qa/page/menu/main.rb
View File

@ -1,7 +1,7 @@
module QA module QA
module Page module Page
module Main module Menu
class Menu < Page::Base class Main < Page::Base
def go_to_groups def go_to_groups
within_top_menu { click_link 'Groups' } within_top_menu { click_link 'Groups' }
end end

2
qa/qa/specs/features/login/standard_spec.rb
View File

@ -7,7 +7,7 @@ module QA
# TODO, since `Signed in successfully` message was removed # TODO, since `Signed in successfully` message was removed
# this is the only way to tell if user is signed in correctly. # this is the only way to tell if user is signed in correctly.
# #
Page::Main::Menu.perform do |menu| Page::Menu::Main.perform do |menu|
expect(menu).to have_personal_area expect(menu).to have_personal_area
end end
end end

2
qa/qa/specs/features/mattermost/group_create_spec.rb
View File

@ -3,7 +3,7 @@ module QA
scenario 'creating a group with a mattermost team' do scenario 'creating a group with a mattermost team' do
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
Page::Main::Menu.act { go_to_groups } Page::Menu::Main.act { go_to_groups }
Page::Dashboard::Groups.perform do |page| Page::Dashboard::Groups.perform do |page|
page.go_to_new_group page.go_to_new_group