Resolved conflictsmove-project-dropdown

1 files changed, 16 insertions, 2 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index f473686d344..71b80a6adcb 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -10,6 +10,7 @@ module QA
     autoload :Namespace, 'qa/runtime/namespace'
     autoload :Scenario, 'qa/runtime/scenario'
     autoload :Browser, 'qa/runtime/browser'
+    autoload :Env, 'qa/runtime/env'
   end
 
   ##
@@ -17,11 +18,14 @@ module QA
   #
   module Factory
     autoload :Base, 'qa/factory/base'
+    autoload :Dependency, 'qa/factory/dependency'
+    autoload :Product, 'qa/factory/product'
 
     module Resource
       autoload :Sandbox, 'qa/factory/resource/sandbox'
       autoload :Group, 'qa/factory/resource/group'
       autoload :Project, 'qa/factory/resource/project'
+      autoload :DeployKey, 'qa/factory/resource/deploy_key'
     end
 
     module Repository
@@ -67,10 +71,15 @@ module QA
 
     module Main
       autoload :Login, 'qa/page/main/login'
-      autoload :Menu, 'qa/page/main/menu'
       autoload :OAuth, 'qa/page/main/oauth'
     end
 
+    module Menu
+      autoload :Main, 'qa/page/menu/main'
+      autoload :Side, 'qa/page/menu/side'
+      autoload :Admin, 'qa/page/menu/admin'
+    end
+
     module Dashboard
       autoload :Projects, 'qa/page/dashboard/projects'
       autoload :Groups, 'qa/page/dashboard/groups'
@@ -84,10 +93,15 @@ module QA
     module Project
       autoload :New, 'qa/page/project/new'
       autoload :Show, 'qa/page/project/show'
+
+      module Settings
+        autoload :Common, 'qa/page/project/settings/common'
+        autoload :Repository, 'qa/page/project/settings/repository'
+        autoload :DeployKeys, 'qa/page/project/settings/deploy_keys'
+      end
     end
 
     module Admin
-      autoload :Menu, 'qa/page/admin/menu'
       autoload :Settings, 'qa/page/admin/settings'
     end