spec: organize selenium spec files better

Change-Id: Id1825b4effdc4865963e8fbf3faaeca81553acd6 Reviewed-on: https://gerrit.instructure.com/11257 Reviewed-by: Bryan Madsen <[email protected]> Tested-by: Jenkins <[email protected]>
lezi · Jun 5, 2012 · 31f3cc0 · 31f3cc0
1 parent 3d4db97
commit 31f3cc0
Show file tree

Hide file tree

Showing 49 changed files with 46 additions and 46 deletions.
diff --git a/lib/tasks/parallelized.rake b/lib/tasks/parallelized.rake
@@ -13,7 +13,7 @@ unless ARGV.any? { |a| a =~ /\Agems/ }
     task :selenium, :count do |t, args|
       require "parallelized_specs"
       count = args[:count]
-      test_files = FileList['spec/selenium/*_spec.rb'] + FileList['vendor/plugins/*/spec_canvas/selenium/*_spec.rb']
+      test_files = FileList['spec/selenium/**/*_spec.rb'] + FileList['vendor/plugins/*/spec_canvas/selenium/*_spec.rb']
       test_files.map! { |f| "#{Rails.root}/#{f}" }
       Rake::Task['parallel:spec'].invoke(count, '', '', test_files.join(' '))
     end

diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
@@ -42,7 +42,7 @@ unless ARGV.any? { |a| a =~ /\Agems/ }
     if ENV['SINGLE_TEST']
       t.spec_opts += ['-e', %{"#{ENV['SINGLE_TEST']}"}]
     end
-    spec_files = FileList['vendor/plugins/*/spec_canvas/**/*_spec.rb'].exclude('vendor/plugins/*/spec_canvas/selenium/*_spec.rb') + FileList['spec/**/*_spec.rb'].exclude('spec/selenium/*_spec.rb')
+    spec_files = FileList['vendor/plugins/*/spec_canvas/**/*_spec.rb'].exclude('vendor/plugins/*/spec_canvas/selenium/*_spec.rb') + FileList['spec/**/*_spec.rb'].exclude('spec/selenium/**/*_spec.rb')
     Gem.loaded_specs.values.each do |spec|
       path = spec.full_gem_path
       spec_canvas_path = File.expand_path(path+"/spec_canvas")

diff --git a/spec/selenium/admin_avatars_spec.rb → spec/selenium/admin/admin_avatars_spec.rb b/spec/selenium/admin_avatars_spec.rb → spec/selenium/admin/admin_avatars_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 describe "admin avatars" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/admin_courses_spec.rb → spec/selenium/admin/admin_courses_spec.rb b/spec/selenium/admin_courses_spec.rb → spec/selenium/admin/admin_courses_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 describe "admin courses tab" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/manage_groups_admin_spec.rb → ...elenium/admin/admin_manage_groups_spec.rb b/spec/selenium/manage_groups_admin_spec.rb → ...elenium/admin/admin_manage_groups_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/manage_groups_common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
+require File.expand_path(File.dirname(__FILE__) + '/../helpers/manage_groups_common')
 require 'thread'
 
 describe "manage admin groups" do

diff --git a/spec/selenium/admin_permissions_spec.rb → .../selenium/admin/admin_permissions_spec.rb b/spec/selenium/admin_permissions_spec.rb → .../selenium/admin/admin_permissions_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 describe "admin permissions" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/...enium/admin_question_bank_content_spec.rb → ...admin/admin_question_bank_content_spec.rb b/...enium/admin_question_bank_content_spec.rb → ...admin/admin_question_bank_content_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/external_tools_common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
+require File.expand_path(File.dirname(__FILE__) + '/../helpers/external_tools_common')
 
 describe "admin question bank" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/admin_question_banks_spec.rb → ...lenium/admin/admin_question_banks_spec.rb b/spec/selenium/admin_question_banks_spec.rb → ...lenium/admin/admin_question_banks_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 describe "admin question banks" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/admin_settings_spec.rb → spec/selenium/admin/admin_settings_spec.rb b/spec/selenium/admin_settings_spec.rb → spec/selenium/admin/admin_settings_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/external_tools_common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
+require File.expand_path(File.dirname(__FILE__) + '/../helpers/external_tools_common')
 
 describe "admin settings tabs" do
   it_should_behave_like "external tools tests"

diff --git a/spec/selenium/admin_settings_tab_spec.rb → ...selenium/admin/admin_settings_tab_spec.rb b/spec/selenium/admin_settings_tab_spec.rb → ...selenium/admin/admin_settings_tab_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 describe "admin settings tab" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/admin_users_spec.rb → spec/selenium/admin/admin_users_spec.rb b/spec/selenium/admin_users_spec.rb → spec/selenium/admin/admin_users_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 describe "admin courses tab" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/calendar2_spec.rb b/spec/selenium/calendar2_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/calendar2_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/calendar2_common')
 
 describe "calendar2" do
   it_should_behave_like "calendar2 selenium tests"

diff --git a/spec/selenium/common.rb b/spec/selenium/common.rb
@@ -21,7 +21,7 @@
 require "socket"
 require "timeout"
 require 'coffee-script'
-require File.expand_path(File.dirname(__FILE__) + '/custom_selenium_rspec_matchers')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/custom_selenium_rspec_matchers')
 require File.expand_path(File.dirname(__FILE__) + '/server')
 include I18nUtilities
 
@@ -760,7 +760,7 @@ def assert_flash_error_message(fail_message_regex)
   # will only load it once even if its called multiple times
   def load_simulate_js
     @load_simulate_js ||= begin
-      js = File.read('spec/selenium/jquery.simulate.js')
+      js = File.read('spec/selenium/helpers/jquery.simulate.js')
       driver.execute_script js
     end
   end

diff --git a/spec/selenium/conversations_attachments_spec.rb b/spec/selenium/conversations_attachments_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 shared_examples_for "conversations attachments selenium tests" do
   it_should_behave_like "forked server selenium tests"

diff --git a/spec/selenium/conversations_context_filtering_spec.rb b/spec/selenium/conversations_context_filtering_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations context filtering" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/conversations_group_spec.rb b/spec/selenium/conversations_group_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations group" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/conversations_recipient_finder_spec.rb b/spec/selenium/conversations_recipient_finder_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations recipient finder" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/conversations_sent_filter_spec.rb b/spec/selenium/conversations_sent_filter_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations sent filter" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/conversations_spec.rb b/spec/selenium/conversations_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/conversations_submissions_spec.rb b/spec/selenium/conversations_submissions_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations submissions" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/conversations_user_notes_spec.rb b/spec/selenium/conversations_user_notes_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/conversations_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common')
 
 describe "conversations user notes" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/discussions_spec.rb b/spec/selenium/discussions_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/discussions_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/discussions_common')
 
 describe "discussions" do
   it_should_behave_like "discussions selenium tests"

diff --git a/spec/selenium/discussions_threaded_spec.rb b/spec/selenium/discussions_threaded_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/discussions_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/discussions_common')
 
 describe "threaded discussions" do
   it_should_behave_like "discussions selenium tests"

diff --git a/spec/selenium/external_tools_spec.rb b/spec/selenium/external_tools_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/external_tools_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/external_tools_common')
 
 describe "editing external tools" do
   it_should_behave_like "external tools tests"

diff --git a/spec/selenium/gradebook2_column_spec.rb b/spec/selenium/gradebook2_column_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/common")
-require File.expand_path(File.dirname(__FILE__) + '/gradebook2_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common')
 
 describe "assignment column headers" do
   it_should_behave_like "gradebook2 selenium tests"

diff --git a/spec/selenium/gradebook2_grade_edit_spec.rb b/spec/selenium/gradebook2_grade_edit_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/common")
-require File.expand_path(File.dirname(__FILE__) + '/gradebook2_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common')
 describe "edititing grades" do
   it_should_behave_like "gradebook2 selenium tests"
 

diff --git a/spec/selenium/gradebook2_group_weight_spec.rb b/spec/selenium/gradebook2_group_weight_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/common")
-require File.expand_path(File.dirname(__FILE__) + '/gradebook2_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common')
 describe "group weights" do
   it_should_behave_like "gradebook2 selenium tests"
 

diff --git a/spec/selenium/gradebook2_spec.rb b/spec/selenium/gradebook2_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/common")
-require File.expand_path(File.dirname(__FILE__) + '/gradebook2_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common')
 
 describe "gradebook2" do
   it_should_behave_like "gradebook2 selenium tests"

diff --git a/spec/selenium/calendar2_common.rb → spec/selenium/helpers/calendar2_common.rb b/spec/selenium/calendar2_common.rb → spec/selenium/helpers/calendar2_common.rb
diff --git a/spec/selenium/conversations_common.rb → .../selenium/helpers/conversations_common.rb b/spec/selenium/conversations_common.rb → .../selenium/helpers/conversations_common.rb
diff --git a/...elenium/custom_selenium_rspec_matchers.rb → ...helpers/custom_selenium_rspec_matchers.rb b/...elenium/custom_selenium_rspec_matchers.rb → ...helpers/custom_selenium_rspec_matchers.rb
diff --git a/spec/selenium/discussions_common.rb → spec/selenium/helpers/discussions_common.rb b/spec/selenium/discussions_common.rb → spec/selenium/helpers/discussions_common.rb
diff --git a/spec/selenium/external_tools_common.rb → ...selenium/helpers/external_tools_common.rb b/spec/selenium/external_tools_common.rb → ...selenium/helpers/external_tools_common.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require File.expand_path(File.dirname(__FILE__) + '/../common')
 
 shared_examples_for "external tools tests" do
   it_should_behave_like "in-process server selenium tests"

diff --git a/spec/selenium/gradebook2_common.rb → spec/selenium/helpers/gradebook2_common.rb b/spec/selenium/gradebook2_common.rb → spec/selenium/helpers/gradebook2_common.rb
diff --git a/spec/selenium/jquery.simulate.js → spec/selenium/helpers/jquery.simulate.js b/spec/selenium/jquery.simulate.js → spec/selenium/helpers/jquery.simulate.js
diff --git a/spec/selenium/manage_groups_common.rb → .../selenium/helpers/manage_groups_common.rb b/spec/selenium/manage_groups_common.rb → .../selenium/helpers/manage_groups_common.rb
diff --git a/spec/selenium/quizzes_common.rb → spec/selenium/helpers/quizzes_common.rb b/spec/selenium/quizzes_common.rb → spec/selenium/helpers/quizzes_common.rb
diff --git a/spec/selenium/wiki_and_tiny_common.rb → .../selenium/helpers/wiki_and_tiny_common.rb b/spec/selenium/wiki_and_tiny_common.rb → .../selenium/helpers/wiki_and_tiny_common.rb
@@ -22,11 +22,11 @@ def wiki_page_tools_file_tree_setup
     @sub_sub_folder = @sub_folder.sub_folders.create!(:name => 'subsubfolder', :context => @course);
     @text_file = @root_folder.attachments.create!(:filename => 'text_file.txt', :context => @course) { |a| a.content_type = 'text/plain' }
     @image1 = @root_folder.attachments.build(:context => @course)
-    path = File.expand_path(File.dirname(__FILE__) + '/../../public/images/email.png')
+    path = File.expand_path(File.dirname(__FILE__) + '/../../../public/images/email.png')
     @image1.uploaded_data = ActionController::TestUploadedFile.new(path, Attachment.mimetype(path))
     @image1.save!
     @image2 = @root_folder.attachments.build(:context => @course)
-    path = File.expand_path(File.dirname(__FILE__) + '/../../public/images/graded.png')
+    path = File.expand_path(File.dirname(__FILE__) + '/../../../public/images/graded.png')
     @image2.uploaded_data = ActionController::TestUploadedFile.new(path, Attachment.mimetype(path))
     @image2.save!
     get "/courses/#{@course.id}/wiki"

diff --git a/spec/selenium/manage_groups_spec.rb b/spec/selenium/manage_groups_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/manage_groups_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/manage_groups_common')
 require 'thread'
 
 describe "manage groups" do

diff --git a/spec/selenium/manage_groups_students_spec.rb b/spec/selenium/manage_groups_students_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/manage_groups_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/manage_groups_common')
 require 'thread'
 
 describe "manage groups students" do

diff --git a/spec/selenium/quizzes_question_banks_spec.rb b/spec/selenium/quizzes_question_banks_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/quizzes_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common')
 
 describe "quizzes question banks" do
   it_should_behave_like "quizzes selenium tests"

diff --git a/spec/selenium/quizzes_question_creation_spec.rb b/spec/selenium/quizzes_question_creation_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/quizzes_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common')
 
 describe "quizzes question creation" do
   it_should_behave_like "quizzes selenium tests"

diff --git a/spec/selenium/quizzes_questions_spec.rb b/spec/selenium/quizzes_questions_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/quizzes_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common')
 
 describe "quizzes questions" do
   it_should_behave_like "quizzes selenium tests"

diff --git a/spec/selenium/quizzes_spec.rb b/spec/selenium/quizzes_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/quizzes_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common')
 
 describe "quizzes" do
   it_should_behave_like "quizzes selenium tests"

diff --git a/spec/selenium/quizzes_students_spec.rb b/spec/selenium/quizzes_students_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/quizzes_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common')
 
 describe "quizzes students" do
   it_should_behave_like "quizzes selenium tests"

diff --git a/spec/selenium/scheduler_spec.rb b/spec/selenium/scheduler_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/calendar2_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/calendar2_common')
 
 EDIT_NAME = 'edited appointment'
 EDIT_LOCATION = 'edited location'

diff --git a/spec/selenium/wiki_and_tiny_files_spec.rb b/spec/selenium/wiki_and_tiny_files_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/wiki_and_tiny_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common')
 
 describe "Wiki pages and Tiny WYSIWYG editor Files" do
   it_should_behave_like "wiki and tiny selenium tests"

diff --git a/spec/selenium/wiki_and_tiny_images_spec.rb b/spec/selenium/wiki_and_tiny_images_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/wiki_and_tiny_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common')
 
 describe "Wiki pages and Tiny WYSIWYG editor Images" do
   it_should_behave_like "wiki and tiny selenium tests"

diff --git a/spec/selenium/wiki_and_tiny_spec.rb b/spec/selenium/wiki_and_tiny_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-require File.expand_path(File.dirname(__FILE__) + '/wiki_and_tiny_common')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common')
 
 describe "Wiki pages and Tiny WYSIWYG editor" do
   it_should_behave_like "wiki and tiny selenium tests"