diff --git a/spec/selenium/accounts_spec.rb b/spec/selenium/accounts_spec.rb index 46a234dd3c0..baa88998fad 100644 --- a/spec/selenium/accounts_spec.rb +++ b/spec/selenium/accounts_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "account" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_admin_logged_in diff --git a/spec/selenium/admin/account_admin_courses_spec.rb b/spec/selenium/admin/account_admin_courses_spec.rb index 97725daf8f4..e9e2b2a41a8 100644 --- a/spec/selenium/admin/account_admin_courses_spec.rb +++ b/spec/selenium/admin/account_admin_courses_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "account admin courses tab" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_course(course_name, has_student = false) Account.default.courses.create(:name => course_name).offer! diff --git a/spec/selenium/admin/account_admin_grading_schemes_spec.rb b/spec/selenium/admin/account_admin_grading_schemes_spec.rb index c5fe5966107..9e6f2a86a0e 100644 --- a/spec/selenium/admin/account_admin_grading_schemes_spec.rb +++ b/spec/selenium/admin/account_admin_grading_schemes_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') require File.expand_path(File.dirname(__FILE__) + '/../helpers/grading_schemes_common') describe "account admin grading schemes" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:account) { Account.default } let(:url) { "/accounts/#{Account.default.id}/grading_standards" } diff --git a/spec/selenium/admin/account_admin_manage_groups_spec.rb b/spec/selenium/admin/account_admin_manage_groups_spec.rb index 18164ca2267..233bcfab649 100644 --- a/spec/selenium/admin/account_admin_manage_groups_spec.rb +++ b/spec/selenium/admin/account_admin_manage_groups_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../helpers/manage_groups_com require 'thread' describe "account admin manage groups" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_account_category (account, name) f(".add_category_link").click diff --git a/spec/selenium/admin/account_admin_outcomes_spec.rb b/spec/selenium/admin/account_admin_outcomes_spec.rb index fb9557525d6..b7049e04059 100644 --- a/spec/selenium/admin/account_admin_outcomes_spec.rb +++ b/spec/selenium/admin/account_admin_outcomes_spec.rb @@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') require File.expand_path(File.dirname(__FILE__) + '/../helpers/outcome_common') describe "account admin outcomes" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:outcome_url) { "/accounts/#{Account.default.id}/outcomes" } let(:who_to_login) { 'admin' } let(:account) { Account.default } diff --git a/spec/selenium/admin/account_admin_question_bank_content_spec.rb b/spec/selenium/admin/account_admin_question_bank_content_spec.rb index 664f1eb3297..c285784fce4 100644 --- a/spec/selenium/admin/account_admin_question_bank_content_spec.rb +++ b/spec/selenium/admin/account_admin_question_bank_content_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') require File.expand_path(File.dirname(__FILE__) + '/../helpers/external_tools_common') describe "account admin question bank" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before(:each) do admin_logged_in diff --git a/spec/selenium/admin/account_admin_rubrics_spec.rb b/spec/selenium/admin/account_admin_rubrics_spec.rb index c03356e061e..4078ee1b842 100644 --- a/spec/selenium/admin/account_admin_rubrics_spec.rb +++ b/spec/selenium/admin/account_admin_rubrics_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../helpers/rubrics_common') require File.expand_path(File.dirname(__FILE__) + '/../common') describe "account shared rubric specs" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:rubric_url) { "/accounts/#{Account.default.id}/rubrics" } let(:who_to_login) { 'admin' } diff --git a/spec/selenium/admin/account_admin_sis_imports_spec.rb b/spec/selenium/admin/account_admin_sis_imports_spec.rb index 125abee01ba..b1bd3477333 100644 --- a/spec/selenium/admin/account_admin_sis_imports_spec.rb +++ b/spec/selenium/admin/account_admin_sis_imports_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "sis imports ui" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def account_with_admin_logged_in(opts = {}) @account = Account.default diff --git a/spec/selenium/admin/account_admin_terms_spec.rb b/spec/selenium/admin/account_admin_terms_spec.rb index 304c4852e31..f036cd80dcc 100644 --- a/spec/selenium/admin/account_admin_terms_spec.rb +++ b/spec/selenium/admin/account_admin_terms_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "account admin terms" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def click_term_action_link(term_div, action_link_css) term_div.find_element(:css, action_link_css).click diff --git a/spec/selenium/admin/admin_avatars_spec.rb b/spec/selenium/admin/admin_avatars_spec.rb index 06687bd8b15..858f72f6a09 100644 --- a/spec/selenium/admin/admin_avatars_spec.rb +++ b/spec/selenium/admin/admin_avatars_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "admin avatars" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_admin_logged_in diff --git a/spec/selenium/admin/admin_settings_tab_spec.rb b/spec/selenium/admin/admin_settings_tab_spec.rb index e5feec6c740..f689c3c6a44 100644 --- a/spec/selenium/admin/admin_settings_tab_spec.rb +++ b/spec/selenium/admin/admin_settings_tab_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "admin settings tab" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_admin_logged_in get "/accounts/#{Account.default.id}/settings" diff --git a/spec/selenium/admin/admin_sub_accounts_spec.rb b/spec/selenium/admin/admin_sub_accounts_spec.rb index efd10e06a3c..4c6219c8d59 100644 --- a/spec/selenium/admin/admin_sub_accounts_spec.rb +++ b/spec/selenium/admin/admin_sub_accounts_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "admin sub accounts" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" DEFAULT_ACCOUNT_ID = Account.default.id def create_sub_account(name = 'sub account', number_to_create = 1, parent_account = Account.default) diff --git a/spec/selenium/admin/admin_users_spec.rb b/spec/selenium/admin/admin_users_spec.rb index 2f257adee27..b3f5394fd90 100755 --- a/spec/selenium/admin/admin_users_spec.rb +++ b/spec/selenium/admin/admin_users_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../helpers/shared_user_metho require File.expand_path(File.dirname(__FILE__) + '/../helpers/basic/users_specs') describe "admin courses tab" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "add user basic" do describe "shared users specs" do diff --git a/spec/selenium/admin/assignments_admin_spec.rb b/spec/selenium/admin/assignments_admin_spec.rb index cf1381b0288..1366d594f3f 100644 --- a/spec/selenium/admin/assignments_admin_spec.rb +++ b/spec/selenium/admin/assignments_admin_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "assignments" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as an admin" do before do diff --git a/spec/selenium/admin/site_admin_authorization_configs_spec.rb b/spec/selenium/admin/site_admin_authorization_configs_spec.rb index 7127e2f4efa..c4c7d463c48 100644 --- a/spec/selenium/admin/site_admin_authorization_configs_spec.rb +++ b/spec/selenium/admin/site_admin_authorization_configs_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "Account Authorization Configs" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "Server errors " do it "should show the error message generated by the server" do diff --git a/spec/selenium/admin/site_admin_developer_keys_spec.rb b/spec/selenium/admin/site_admin_developer_keys_spec.rb index 5cd05aa644d..4bc4b4a3178 100644 --- a/spec/selenium/admin/site_admin_developer_keys_spec.rb +++ b/spec/selenium/admin/site_admin_developer_keys_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "managing developer keys" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before :each do account_admin_user(:account => Account.site_admin) diff --git a/spec/selenium/admin/site_admin_jobs_spec.rb b/spec/selenium/admin/site_admin_jobs_spec.rb index f766a10cf0f..26305bfe135 100644 --- a/spec/selenium/admin/site_admin_jobs_spec.rb +++ b/spec/selenium/admin/site_admin_jobs_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') describe "site admin jobs ui" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" module FlavorTags ALL = 'All' diff --git a/spec/selenium/admin/sub_accounts/courses_spec.rb b/spec/selenium/admin/sub_accounts/courses_spec.rb index 1991c4fe173..0ab98c236c0 100644 --- a/spec/selenium/admin/sub_accounts/courses_spec.rb +++ b/spec/selenium/admin/sub_accounts/courses_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../common') describe "sub account courses" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:url) { "/accounts/#{account.id}" } diff --git a/spec/selenium/admin/sub_accounts/grading_schemes_spec.rb b/spec/selenium/admin/sub_accounts/grading_schemes_spec.rb index ca2d194b119..d8bd2780b61 100644 --- a/spec/selenium/admin/sub_accounts/grading_schemes_spec.rb +++ b/spec/selenium/admin/sub_accounts/grading_schemes_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../common') require File.expand_path(File.dirname(__FILE__) + '/../../helpers/grading_schemes_common') describe "sub account grading schemes" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:url) { "/accounts/#{account.id}/grading_standards" } diff --git a/spec/selenium/admin/sub_accounts/outcomes_spec.rb b/spec/selenium/admin/sub_accounts/outcomes_spec.rb index 402f05bbe51..cfce6881478 100644 --- a/spec/selenium/admin/sub_accounts/outcomes_spec.rb +++ b/spec/selenium/admin/sub_accounts/outcomes_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../common') require File.expand_path(File.dirname(__FILE__) + '/../../helpers/outcome_common') describe "sub account outcomes" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" describe "account outcome specs" do let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } diff --git a/spec/selenium/admin/sub_accounts/rubrics_spec.rb b/spec/selenium/admin/sub_accounts/rubrics_spec.rb index 2144b6c3c3b..61639a4775c 100644 --- a/spec/selenium/admin/sub_accounts/rubrics_spec.rb +++ b/spec/selenium/admin/sub_accounts/rubrics_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../common') require File.expand_path(File.dirname(__FILE__) + '/../../helpers/rubrics_common') describe "sub account shared rubric specs" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:rubric_url) { "/accounts/#{account.id}/rubrics" } let(:who_to_login) { 'admin' } diff --git a/spec/selenium/admin_tools_spec.rb b/spec/selenium/admin_tools_spec.rb index ddc966ff424..620d0e36c36 100644 --- a/spec/selenium/admin_tools_spec.rb +++ b/spec/selenium/admin_tools_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/calendar2_common') require File.expand_path(File.dirname(__FILE__) + '/../cassandra_spec_helper') describe "admin_tools" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def load_admin_tools_page get "/accounts/#{@account.id}/admin_tools" diff --git a/spec/selenium/alerts_spec.rb b/spec/selenium/alerts_spec.rb index 24c6742fe52..93dd60bc5f7 100644 --- a/spec/selenium/alerts_spec.rb +++ b/spec/selenium/alerts_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "Alerts" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do @context = Account.default diff --git a/spec/selenium/announcements_spec.rb b/spec/selenium/announcements_spec.rb index f7fbbe5cd48..0c95612b4ed 100644 --- a/spec/selenium/announcements_spec.rb +++ b/spec/selenium/announcements_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "announcements" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def create_announcement(message = 'announcement message') @context = @course diff --git a/spec/selenium/application_spec.rb b/spec/selenium/application_spec.rb index 5733f91793c..a9001ae7376 100644 --- a/spec/selenium/application_spec.rb +++ b/spec/selenium/application_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "Authenticity Tokens" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should change the authenticity token on each request" do user_logged_in diff --git a/spec/selenium/assignments_discussion_spec.rb b/spec/selenium/assignments_discussion_spec.rb index 28d9e55755c..964d457f427 100644 --- a/spec/selenium/assignments_discussion_spec.rb +++ b/spec/selenium/assignments_discussion_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/assignments_common') describe "discussion assignments" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do diff --git a/spec/selenium/assignments_external_tool_spec.rb b/spec/selenium/assignments_external_tool_spec.rb index 06ef224e0e1..bf9feeca9a0 100644 --- a/spec/selenium/assignments_external_tool_spec.rb +++ b/spec/selenium/assignments_external_tool_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "external tool assignments" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/assignments_group_spec.rb b/spec/selenium/assignments_group_spec.rb index 297f7fd3a48..abb93f36444 100644 --- a/spec/selenium/assignments_group_spec.rb +++ b/spec/selenium/assignments_group_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "assignment groups" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def get_assignment_groups ff('#groups .assignment_group') diff --git a/spec/selenium/assignments_overrides_spec.rb b/spec/selenium/assignments_overrides_spec.rb index 0350bed5a98..5b375b68ea6 100644 --- a/spec/selenium/assignments_overrides_spec.rb +++ b/spec/selenium/assignments_overrides_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/assignment_overrides describe "assignment groups" do include AssignmentOverridesSeleniumHelper - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/assignments_quizzes_spec.rb b/spec/selenium/assignments_quizzes_spec.rb index 70b86e6beec..d172132f6fc 100644 --- a/spec/selenium/assignments_quizzes_spec.rb +++ b/spec/selenium/assignments_quizzes_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/assignments_common') describe "quizzes assignments" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do diff --git a/spec/selenium/assignments_rubrics_spec.rb b/spec/selenium/assignments_rubrics_spec.rb index f68422fb4aa..54c396b5d0b 100644 --- a/spec/selenium/assignments_rubrics_spec.rb +++ b/spec/selenium/assignments_rubrics_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "assignment rubrics" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "assignment rubrics as a teacher" do before (:each) do diff --git a/spec/selenium/assignments_spec.rb b/spec/selenium/assignments_spec.rb index f8c703ea4bb..c238cfe6a1f 100644 --- a/spec/selenium/assignments_spec.rb +++ b/spec/selenium/assignments_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "assignments" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/assignments_student_spec.rb b/spec/selenium/assignments_student_spec.rb index 0e244670cf7..06da76569da 100755 --- a/spec/selenium/assignments_student_spec.rb +++ b/spec/selenium/assignments_student_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "assignments" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do diff --git a/spec/selenium/assignments_turn_it_in_spec.rb b/spec/selenium/assignments_turn_it_in_spec.rb index 1d80963af32..4deff0bdcd2 100644 --- a/spec/selenium/assignments_turn_it_in_spec.rb +++ b/spec/selenium/assignments_turn_it_in_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "assignments turn it in" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/calendar2_spec.rb b/spec/selenium/calendar2_spec.rb index edff1ac77c8..cb5de9ae55d 100644 --- a/spec/selenium/calendar2_spec.rb +++ b/spec/selenium/calendar2_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') require File.expand_path(File.dirname(__FILE__) + '/helpers/calendar2_common') describe "calendar2" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do Account.default.tap do |a| diff --git a/spec/selenium/calendar_spec.rb b/spec/selenium/calendar_spec.rb index 3b79c9b95a4..a908a55a5a6 100644 --- a/spec/selenium/calendar_spec.rb +++ b/spec/selenium/calendar_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "calendar" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def go_to_calendar get "/calendar" diff --git a/spec/selenium/collaborations_spec.rb b/spec/selenium/collaborations_spec.rb index a74654f629e..33e3c9a5cac 100644 --- a/spec/selenium/collaborations_spec.rb +++ b/spec/selenium/collaborations_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "collaborations" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" # Helper methods # ============== diff --git a/spec/selenium/common.rb b/spec/selenium/common.rb index ac845cef789..78084211843 100644 --- a/spec/selenium/common.rb +++ b/spec/selenium/common.rb @@ -16,6 +16,15 @@ # with this program. If not, see . # +require File.expand_path(File.dirname(__FILE__) + '/../../config/canvas_rails3') +if CANVAS_RAILS2 + Spec::Example::ExampleGroupMethods.module_eval do + def include_examples(*args) + it_should_behave_like(*args) + end + end +end + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require "selenium-webdriver" require "socket" @@ -191,9 +200,13 @@ module SeleniumTestsHelperMethods def self.rack_app() app = Rack::Builder.new do use Rails::Rack::Debugger unless Rails.env.test? - map '/' do - use Rails::Rack::Static - run ActionController::Dispatcher.new + if CANVAS_RAILS2 + map '/' do + use Rails::Rack::Static + run ActionController::Dispatcher.new + end + else + run CanvasRails::Application end end.to_app return app @@ -275,7 +288,11 @@ shared_examples_for "all selenium tests" do include CustomSeleniumRspecMatchers # set up so you can use rails urls helpers in your selenium tests - include ActionController::UrlWriter + if CANVAS_RAILS2 + include ActionController::UrlWriter + else + include Rails.application.routes.url_helpers + end def selenium_driver; $selenium_driver @@ -1058,7 +1075,7 @@ def find_css_in_string(string_of_html, css_selector) end shared_examples_for "in-process server selenium tests" do - it_should_behave_like "all selenium tests" + include_examples "all selenium tests" prepend_before (:all) do $in_proc_webserver_shutdown ||= SeleniumTestsHelperMethods.start_webserver(WEBSERVER) end diff --git a/spec/selenium/communication_channels_spec.rb b/spec/selenium/communication_channels_spec.rb index 71d7d1a05cd..796ff9a59ba 100644 --- a/spec/selenium/communication_channels_spec.rb +++ b/spec/selenium/communication_channels_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "communication channel selenium tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "confirm" do it "should register the user" do diff --git a/spec/selenium/concluded_unconcluded_spec.rb b/spec/selenium/concluded_unconcluded_spec.rb index 55b15a53574..91c44bc033d 100644 --- a/spec/selenium/concluded_unconcluded_spec.rb +++ b/spec/selenium/concluded_unconcluded_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "concluded/unconcluded" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do username = "nobody@example.com" diff --git a/spec/selenium/conference_spec.rb b/spec/selenium/conference_spec.rb index 1a7da81a037..e0548669b63 100644 --- a/spec/selenium/conference_spec.rb +++ b/spec/selenium/conference_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "web conference" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/content_exports_spec.rb b/spec/selenium/content_exports_spec.rb index 36dae3cd4cc..4b5fd015f36 100644 --- a/spec/selenium/content_exports_spec.rb +++ b/spec/selenium/content_exports_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "content exports" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/content_migrations_spec.rb b/spec/selenium/content_migrations_spec.rb index bda7f77e9b3..8a5d5073316 100644 --- a/spec/selenium/content_migrations_spec.rb +++ b/spec/selenium/content_migrations_spec.rb @@ -146,7 +146,7 @@ def test_selective_content(source_course=nil) end describe "content migrations" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "common cartridge importing" do before :each do diff --git a/spec/selenium/content_participation_counts_spec.rb b/spec/selenium/content_participation_counts_spec.rb index 15256230a94..83baa236d06 100644 --- a/spec/selenium/content_participation_counts_spec.rb +++ b/spec/selenium/content_participation_counts_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "courses" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do course_with_student_logged_in(:active_all => true) diff --git a/spec/selenium/context_modules_spec.rb b/spec/selenium/context_modules_spec.rb index fadeaa22cb1..adadde39595 100644 --- a/spec/selenium/context_modules_spec.rb +++ b/spec/selenium/context_modules_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/context_modules_common') describe "context_modules" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do before (:each) do diff --git a/spec/selenium/context_modules_student_spec.rb b/spec/selenium/context_modules_student_spec.rb index dcec78aa165..103363d8122 100644 --- a/spec/selenium/context_modules_student_spec.rb +++ b/spec/selenium/context_modules_student_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "context_modules" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do def create_context_module(module_name) diff --git a/spec/selenium/conversations_attachments_spec.rb b/spec/selenium/conversations_attachments_spec.rb index ab94f45b732..78acd0d7f64 100644 --- a/spec/selenium/conversations_attachments_spec.rb +++ b/spec/selenium/conversations_attachments_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations attachments local tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do conversation_setup @@ -140,7 +140,7 @@ describe "conversations attachments local tests" do end describe "conversations attachments S3 tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do conversation_setup diff --git a/spec/selenium/conversations_context_filtering_spec.rb b/spec/selenium/conversations_context_filtering_spec.rb index 9db9b08f6c9..197f2997157 100644 --- a/spec/selenium/conversations_context_filtering_spec.rb +++ b/spec/selenium/conversations_context_filtering_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations context filtering" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do conversation_setup diff --git a/spec/selenium/conversations_group_spec.rb b/spec/selenium/conversations_group_spec.rb index 9366b38ae2a..fa125d98582 100644 --- a/spec/selenium/conversations_group_spec.rb +++ b/spec/selenium/conversations_group_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations group" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before(:each) do conversation_setup diff --git a/spec/selenium/conversations_new_spec.rb b/spec/selenium/conversations_new_spec.rb index 42fa8e3724d..dd7c33ac097 100644 --- a/spec/selenium/conversations_new_spec.rb +++ b/spec/selenium/conversations_new_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations new" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def conversations_url "/conversations" diff --git a/spec/selenium/conversations_recipient_finder_spec.rb b/spec/selenium/conversations_recipient_finder_spec.rb index a6477c0c5b1..76763a1b33b 100644 --- a/spec/selenium/conversations_recipient_finder_spec.rb +++ b/spec/selenium/conversations_recipient_finder_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations recipient finder" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def conversations_path(params={}) hash = params.to_json.unpack('H*').first diff --git a/spec/selenium/conversations_sent_filter_spec.rb b/spec/selenium/conversations_sent_filter_spec.rb index 021b7fd8c70..c6c4aa2ac6f 100644 --- a/spec/selenium/conversations_sent_filter_spec.rb +++ b/spec/selenium/conversations_sent_filter_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations sent filter" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do conversation_setup diff --git a/spec/selenium/conversations_spec.rb b/spec/selenium/conversations_spec.rb index 354e2883a85..155ad31aed4 100644 --- a/spec/selenium/conversations_spec.rb +++ b/spec/selenium/conversations_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do conversation_setup diff --git a/spec/selenium/conversations_submissions_spec.rb b/spec/selenium/conversations_submissions_spec.rb index 818dbf993da..18235630cda 100644 --- a/spec/selenium/conversations_submissions_spec.rb +++ b/spec/selenium/conversations_submissions_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations submissions" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do conversation_setup diff --git a/spec/selenium/conversations_user_notes_spec.rb b/spec/selenium/conversations_user_notes_spec.rb index 530a4252645..26180e14112 100644 --- a/spec/selenium/conversations_user_notes_spec.rb +++ b/spec/selenium/conversations_user_notes_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/conversations_common') describe "conversations user notes" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before(:each) do conversation_setup diff --git a/spec/selenium/course_copy_spec.rb b/spec/selenium/course_copy_spec.rb index 8b8cba0855a..7f1bf4c1329 100644 --- a/spec/selenium/course_copy_spec.rb +++ b/spec/selenium/course_copy_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "course copy" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def validate_course_main_page header = f('#section-tabs-header') diff --git a/spec/selenium/course_sections_spec.rb b/spec/selenium/course_sections_spec.rb index 6395c75003f..b0a094627e5 100644 --- a/spec/selenium/course_sections_spec.rb +++ b/spec/selenium/course_sections_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "course sections" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_enrollment(enrollment_state, section) enrollment = student_in_course(:workflow_state => enrollment_state, :course_section => section) diff --git a/spec/selenium/course_settings_spec.rb b/spec/selenium/course_settings_spec.rb index 9e4bbd5219c..07c7c13f024 100644 --- a/spec/selenium/course_settings_spec.rb +++ b/spec/selenium/course_settings_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "course settings" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in :limit_privileges_to_course_section => false diff --git a/spec/selenium/course_statistics_spec.rb b/spec/selenium/course_statistics_spec.rb index 835384bb2a4..4546e0f0dc0 100644 --- a/spec/selenium/course_statistics_spec.rb +++ b/spec/selenium/course_statistics_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "course statistics" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/courses_spec.rb b/spec/selenium/courses_spec.rb index 07bf8a90ed9..0fff4366d2d 100644 --- a/spec/selenium/courses_spec.rb +++ b/spec/selenium/courses_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "courses" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/cross_listing_spec.rb b/spec/selenium/cross_listing_spec.rb index 1294ca92104..d471be60db1 100644 --- a/spec/selenium/cross_listing_spec.rb +++ b/spec/selenium/cross_listing_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "cross-listing" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do course_with_teacher_logged_in diff --git a/spec/selenium/dashboard_spec.rb b/spec/selenium/dashboard_spec.rb index 40772611057..b897695d2ba 100644 --- a/spec/selenium/dashboard_spec.rb +++ b/spec/selenium/dashboard_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "dashboard" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do diff --git a/spec/selenium/default_plugins_spec.rb b/spec/selenium/default_plugins_spec.rb index 6337a71fd49..1436d8dd572 100644 --- a/spec/selenium/default_plugins_spec.rb +++ b/spec/selenium/default_plugins_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "default plugins" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before(:each) do user_logged_in diff --git a/spec/selenium/discussions_spec.rb b/spec/selenium/discussions_spec.rb index 288ac771bea..c2af47ae9c0 100644 --- a/spec/selenium/discussions_spec.rb +++ b/spec/selenium/discussions_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/discussions_common') describe "discussions" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:course) { course_model.tap(&:offer!) } let(:default_section) { course.default_section } diff --git a/spec/selenium/discussions_threaded_spec.rb b/spec/selenium/discussions_threaded_spec.rb index 689922b3073..ad7d4faa991 100644 --- a/spec/selenium/discussions_threaded_spec.rb +++ b/spec/selenium/discussions_threaded_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/discussions_common') describe "threaded discussions" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do @topic_title = 'threaded discussion topic' diff --git a/spec/selenium/enhanceable_content_spec.rb b/spec/selenium/enhanceable_content_spec.rb index e64673e4a3c..a4aebfcecdc 100644 --- a/spec/selenium/enhanceable_content_spec.rb +++ b/spec/selenium/enhanceable_content_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "enhanceable_content" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should automatically enhance content using jQuery UI" do stub_kaltura diff --git a/spec/selenium/eportfolios_spec.rb b/spec/selenium/eportfolios_spec.rb index 4d45449bc1b..07368124a36 100755 --- a/spec/selenium/eportfolios_spec.rb +++ b/spec/selenium/eportfolios_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "eportfolios" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def create_eportfolio(is_public = false) get "/dashboard/eportfolios" @@ -265,7 +265,7 @@ describe "eportfolios" do end describe "eportfolios file upload" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do @password = "asdfasdf" diff --git a/spec/selenium/error_reports_spec.rb b/spec/selenium/error_reports_spec.rb index 0f82ca90a17..00f961c2059 100644 --- a/spec/selenium/error_reports_spec.rb +++ b/spec/selenium/error_reports_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "error reporting" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should log the same error at most 1 time per 5 seconds" do get('/logout') diff --git a/spec/selenium/external_tool_buttons_spec.rb b/spec/selenium/external_tool_buttons_spec.rb index 3ca99da93d1..dc0a99464fb 100644 --- a/spec/selenium/external_tool_buttons_spec.rb +++ b/spec/selenium/external_tool_buttons_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "external tool buttons" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/file_spec.rb b/spec/selenium/file_spec.rb index f4449062db3..9d2499f9913 100644 --- a/spec/selenium/file_spec.rb +++ b/spec/selenium/file_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') require File.expand_path(File.dirname(__FILE__) + '/helpers/files_common') describe "shared files tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def fixture_file_path(file) path = ActionController::TestCase.respond_to?(:fixture_path) ? ActionController::TestCase.send(:fixture_path) : nil @@ -189,7 +189,7 @@ end describe "zip file uploads" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "courses" do before do diff --git a/spec/selenium/files_spec.rb b/spec/selenium/files_spec.rb index 2eb7d7d58cb..b1bc272ecb3 100644 --- a/spec/selenium/files_spec.rb +++ b/spec/selenium/files_spec.rb @@ -59,7 +59,7 @@ def file_setup end describe "common file behaviors" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_file(file_fullpath) attachment_field = keep_trying_until do @@ -168,7 +168,7 @@ describe "common file behaviors" do end describe "files without s3 and forked tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do @folder_name = "my folder" @@ -219,7 +219,7 @@ describe "files without s3 and forked tests" do end describe "course files" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should not show root folder files in the collaborations folder when there is a collaboration" do course_with_teacher_logged_in @@ -252,7 +252,7 @@ describe "course files" do end describe "scribd re-rendering" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do ScribdAPI.stubs(:config).returns({ :key => "key", :secret => "what" }) diff --git a/spec/selenium/google_analytics.rb b/spec/selenium/google_analytics.rb index 51944e18316..5d32e78b4ca 100644 --- a/spec/selenium/google_analytics.rb +++ b/spec/selenium/google_analytics.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "google analytics" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should not include tracking script if not asked to" do get "/" diff --git a/spec/selenium/grade_passback_spec.rb b/spec/selenium/grade_passback_spec.rb index 32de60d9da9..4e774e17e93 100644 --- a/spec/selenium/grade_passback_spec.rb +++ b/spec/selenium/grade_passback_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "grade exchange course settings tab" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def getpseudonym(user_sis_id) pseudo = Pseudonym.find_by_sis_user_id(user_sis_id) diff --git a/spec/selenium/gradebook2_column_spec.rb b/spec/selenium/gradebook2_column_spec.rb index 7a8da564988..f58cdabe850 100644 --- a/spec/selenium/gradebook2_column_spec.rb +++ b/spec/selenium/gradebook2_column_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common') describe "assignment column headers" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" ASSIGNMENT_1_POINTS = "10" ASSIGNMENT_2_POINTS = "5" diff --git a/spec/selenium/gradebook2_grade_edit_spec.rb b/spec/selenium/gradebook2_grade_edit_spec.rb index cd896e5315e..e5d85bc5e47 100755 --- a/spec/selenium/gradebook2_grade_edit_spec.rb +++ b/spec/selenium/gradebook2_grade_edit_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common') describe "edititing grades" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" ASSIGNMENT_1_POINTS = "10" ASSIGNMENT_2_POINTS = "5" diff --git a/spec/selenium/gradebook2_group_weight_spec.rb b/spec/selenium/gradebook2_group_weight_spec.rb index ba892efb6d5..48d741abc90 100644 --- a/spec/selenium/gradebook2_group_weight_spec.rb +++ b/spec/selenium/gradebook2_group_weight_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common') describe "group weights" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" ASSIGNMENT_1_POINTS = "10" ASSIGNMENT_2_POINTS = "5" diff --git a/spec/selenium/gradebook2_spec.rb b/spec/selenium/gradebook2_spec.rb index 5fe04661b82..7747913f0c4 100644 --- a/spec/selenium/gradebook2_spec.rb +++ b/spec/selenium/gradebook2_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/gradebook2_common') describe "gradebook2" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" ASSIGNMENT_1_POINTS = "10" ASSIGNMENT_2_POINTS = "5" diff --git a/spec/selenium/gradebook_uploads_spec.rb b/spec/selenium/gradebook_uploads_spec.rb index 48a4d94eee2..f83e292622d 100644 --- a/spec/selenium/gradebook_uploads_spec.rb +++ b/spec/selenium/gradebook_uploads_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "gradebook uploads" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do course_with_teacher_logged_in(:active_all => 1, :username => 'teacher@example.com') diff --git a/spec/selenium/gradebooks_spec.rb b/spec/selenium/gradebooks_spec.rb index 1bbd238533c..7fc0eec4cc9 100644 --- a/spec/selenium/gradebooks_spec.rb +++ b/spec/selenium/gradebooks_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "gradebook1" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before(:each) do course_with_teacher_logged_in(:active_all => true) diff --git a/spec/selenium/grades_spec.rb b/spec/selenium/grades_spec.rb index 38eda19f429..6c7a5b0b8d9 100644 --- a/spec/selenium/grades_spec.rb +++ b/spec/selenium/grades_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "grades" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher(:active_all => true) diff --git a/spec/selenium/grading_standards_spec.rb b/spec/selenium/grading_standards_spec.rb index 1a0dfce6d6c..13e1d58d2a1 100644 --- a/spec/selenium/grading_standards_spec.rb +++ b/spec/selenium/grading_standards_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "grading standards" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should allow creating/deleting grading standards" do course_with_teacher_logged_in diff --git a/spec/selenium/groups_spec.rb b/spec/selenium/groups_spec.rb index 9700864ef8c..d765d7e7980 100644 --- a/spec/selenium/groups_spec.rb +++ b/spec/selenium/groups_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "groups" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should allow students to join self signup groups" do course_with_student_logged_in(:active_all => true) diff --git a/spec/selenium/handlebars_spec.rb b/spec/selenium/handlebars_spec.rb index 6c4d97c48e5..7d8469ec416 100644 --- a/spec/selenium/handlebars_spec.rb +++ b/spec/selenium/handlebars_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") require 'lib/handlebars/handlebars' describe "handlebars" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/help_dialog_spec.rb b/spec/selenium/help_dialog_spec.rb index 2496ff78b5e..52184661f04 100644 --- a/spec/selenium/help_dialog_spec.rb +++ b/spec/selenium/help_dialog_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "help dialog" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "no user logged in" do it "should work with no logged in user" do diff --git a/spec/selenium/helpers/basic/permissions_specs.rb b/spec/selenium/helpers/basic/permissions_specs.rb index 23ac4ce34d1..885faa4ed3d 100644 --- a/spec/selenium/helpers/basic/permissions_specs.rb +++ b/spec/selenium/helpers/basic/permissions_specs.rb @@ -1,5 +1,5 @@ shared_examples_for "permission tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_admin_logged_in diff --git a/spec/selenium/helpers/basic/question_banks_specs.rb b/spec/selenium/helpers/basic/question_banks_specs.rb index 65dc7a73ee9..fe03cecd24d 100644 --- a/spec/selenium/helpers/basic/question_banks_specs.rb +++ b/spec/selenium/helpers/basic/question_banks_specs.rb @@ -1,5 +1,5 @@ shared_examples_for "question bank basic tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do admin_logged_in get url diff --git a/spec/selenium/helpers/basic/settings_specs.rb b/spec/selenium/helpers/basic/settings_specs.rb index 3680d515054..7bdbc87d73f 100644 --- a/spec/selenium/helpers/basic/settings_specs.rb +++ b/spec/selenium/helpers/basic/settings_specs.rb @@ -1,5 +1,5 @@ shared_examples_for "settings basic tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_admin_logged_in diff --git a/spec/selenium/helpers/basic/statistics_specs.rb b/spec/selenium/helpers/basic/statistics_specs.rb index 21134dfdc14..a98b0309536 100644 --- a/spec/selenium/helpers/basic/statistics_specs.rb +++ b/spec/selenium/helpers/basic/statistics_specs.rb @@ -1,5 +1,5 @@ shared_examples_for "statistics basic tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def item_lists ff('.item_list') diff --git a/spec/selenium/helpers/basic/users_specs.rb b/spec/selenium/helpers/basic/users_specs.rb index b9846419215..0fdccd79a9e 100644 --- a/spec/selenium/helpers/basic/users_specs.rb +++ b/spec/selenium/helpers/basic/users_specs.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../..//helpers/shared_user_methods') shared_examples_for "users basic tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "should add a new user" do pending('newly added user in sub account does not show up') if account != Account.default diff --git a/spec/selenium/helpers/external_tools_common.rb b/spec/selenium/helpers/external_tools_common.rb index b603ea5efef..46321a97b06 100644 --- a/spec/selenium/helpers/external_tools_common.rb +++ b/spec/selenium/helpers/external_tools_common.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') shared_examples_for "external tools tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_external_tool (*opts) name = "external tool" diff --git a/spec/selenium/helpers/quizzes_common.rb b/spec/selenium/helpers/quizzes_common.rb index cb62370b0f6..2b45730d5a5 100644 --- a/spec/selenium/helpers/quizzes_common.rb +++ b/spec/selenium/helpers/quizzes_common.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../common') shared_examples_for "quizzes selenium tests" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def create_multiple_choice_question question = fj(".question_form:visible") diff --git a/spec/selenium/i18n_js_spec.rb b/spec/selenium/i18n_js_spec.rb index 93b2c6eda27..ac5e785ff50 100644 --- a/spec/selenium/i18n_js_spec.rb +++ b/spec/selenium/i18n_js_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "i18n js" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/jquery_spec.rb b/spec/selenium/jquery_spec.rb index 4d951ed68f5..d804b39e178 100644 --- a/spec/selenium/jquery_spec.rb +++ b/spec/selenium/jquery_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "jquery" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" # jquery keeps breaking attr() ... see http://bugs.jquery.com/ticket/10278 diff --git a/spec/selenium/jquery_ui_spec.rb b/spec/selenium/jquery_ui_spec.rb index 0dcbcf77766..81de6582e17 100644 --- a/spec/selenium/jquery_ui_spec.rb +++ b/spec/selenium/jquery_ui_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/common") describe "jquery ui" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def active driver.switch_to.active_element diff --git a/spec/selenium/layout_spec.rb b/spec/selenium/layout_spec.rb index 595220deb4e..2b4c9b6bcc2 100644 --- a/spec/selenium/layout_spec.rb +++ b/spec/selenium/layout_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "layout" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_student_logged_in diff --git a/spec/selenium/manage_groups_spec.rb b/spec/selenium/manage_groups_spec.rb index e8a84b8c30c..cca7a5f07e4 100644 --- a/spec/selenium/manage_groups_spec.rb +++ b/spec/selenium/manage_groups_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/manage_groups_common require 'thread' describe "manage groups" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/manage_groups_students_spec.rb b/spec/selenium/manage_groups_students_spec.rb index 7a042ec921f..233ff13b872 100644 --- a/spec/selenium/manage_groups_students_spec.rb +++ b/spec/selenium/manage_groups_students_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/manage_groups_common require 'thread' describe "manage groups students" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/oauth_spec.rb b/spec/selenium/oauth_spec.rb index 9796360f02d..fe57ec2db46 100644 --- a/spec/selenium/oauth_spec.rb +++ b/spec/selenium/oauth_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "oauth2 flow" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do @key = DeveloperKey.create!(:name => 'Specs', :redirect_uri => 'http://www.example.com') @@ -50,7 +50,7 @@ describe "oauth2 flow" do end describe "oauth2 tool icons" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do course_with_student_logged_in(:active_all => true) end diff --git a/spec/selenium/outcome_spec.rb b/spec/selenium/outcome_spec.rb index 2d090ab0e02..a0043e69291 100644 --- a/spec/selenium/outcome_spec.rb +++ b/spec/selenium/outcome_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/outcome_common') describe "outcomes" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:who_to_login) { 'teacher' } let(:outcome_url) { "/courses/#{@course.id}/outcomes" } diff --git a/spec/selenium/people_settings_spec.rb b/spec/selenium/people_settings_spec.rb index 5dd1b5ef5c6..f4826cbba4e 100644 --- a/spec/selenium/people_settings_spec.rb +++ b/spec/selenium/people_settings_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "course people" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do course_with_teacher_logged_in :limit_privileges_to_course_section => false diff --git a/spec/selenium/people_spec.rb b/spec/selenium/people_spec.rb index c8d5415b332..5917fdcf94a 100755 --- a/spec/selenium/people_spec.rb +++ b/spec/selenium/people_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "people" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_user(option_text, username, user_list_selector) click_option('#enrollment_type', option_text) diff --git a/spec/selenium/plugins/sessions_timeout_spec.rb b/spec/selenium/plugins/sessions_timeout_spec.rb index f65f0ab9873..fa232028cda 100644 --- a/spec/selenium/plugins/sessions_timeout_spec.rb +++ b/spec/selenium/plugins/sessions_timeout_spec.rb @@ -1,7 +1,7 @@ require File.expand_path('spec/selenium/common') describe "Sessions Timeout" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" describe "Validations" do context "when you are logged in as an admin" do diff --git a/spec/selenium/plugins_spec.rb b/spec/selenium/plugins_spec.rb index aaa1f797b87..10e212f863c 100644 --- a/spec/selenium/plugins_spec.rb +++ b/spec/selenium/plugins_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "plugins ui" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before(:each) do site_admin_logged_in diff --git a/spec/selenium/profile_communications_spec.rb b/spec/selenium/profile_communications_spec.rb index bf8cd6d3700..0b266040947 100644 --- a/spec/selenium/profile_communications_spec.rb +++ b/spec/selenium/profile_communications_spec.rb @@ -18,7 +18,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "profile communication settings" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before :each do user_logged_in(:username => 'somebody@example.com') diff --git a/spec/selenium/profile_spec.rb b/spec/selenium/profile_spec.rb index ee8d3624ccd..d4fa754ce72 100644 --- a/spec/selenium/profile_spec.rb +++ b/spec/selenium/profile_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "profile" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def click_edit f('.edit_settings_link').click diff --git a/spec/selenium/public_courses_spec.rb b/spec/selenium/public_courses_spec.rb index 9071527da2a..55a0e7c422f 100644 --- a/spec/selenium/public_courses_spec.rb +++ b/spec/selenium/public_courses_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') require File.expand_path(File.dirname(__FILE__) + '/helpers/assignment_overrides.rb') describe "public courses" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def ensure_logged_out driver.navigate.to(app_host + '/logout') diff --git a/spec/selenium/question_banks_spec.rb b/spec/selenium/question_banks_spec.rb index 47cc9053d0c..4b43ef98d06 100644 --- a/spec/selenium/question_banks_spec.rb +++ b/spec/selenium/question_banks_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "question bank" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it "deleting AJAX-loaded questions should work" do course_with_teacher_logged_in diff --git a/spec/selenium/self_enrollment_spec.rb b/spec/selenium/self_enrollment_spec.rb index f2b4d28dc56..10586bf85fa 100644 --- a/spec/selenium/self_enrollment_spec.rb +++ b/spec/selenium/self_enrollment_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "self enrollment" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "in a full course" do it "should not be allowed" do diff --git a/spec/selenium/student_interactions_report_spec.rb b/spec/selenium/student_interactions_report_spec.rb index f47262c24fa..5fced0c7bbd 100644 --- a/spec/selenium/student_interactions_report_spec.rb +++ b/spec/selenium/student_interactions_report_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "student interactions report" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do diff --git a/spec/selenium/student_scheduler_spec.rb b/spec/selenium/student_scheduler_spec.rb index 09c03cdcee7..60e55890696 100644 --- a/spec/selenium/student_scheduler_spec.rb +++ b/spec/selenium/student_scheduler_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/calendar2_common') require File.expand_path(File.dirname(__FILE__) + '/helpers/scheduler_common') describe "scheduler" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do before (:each) do diff --git a/spec/selenium/student_submissions_spec.rb b/spec/selenium/student_submissions_spec.rb index 1e9427bbd58..8042cc5d598 100644 --- a/spec/selenium/student_submissions_spec.rb +++ b/spec/selenium/student_submissions_spec.rb @@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/submissions_common') describe "submissions" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context 'as a student' do @@ -226,7 +226,7 @@ describe "submissions" do end describe 'uploaded files for submission' do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def fixture_file_path(file) path = ActionController::TestCase.respond_to?(:fixture_path) ? ActionController::TestCase.send(:fixture_path) : nil diff --git a/spec/selenium/student_user_content_spec.rb b/spec/selenium/student_user_content_spec.rb index f0fa0c50b41..e8c68bc8080 100644 --- a/spec/selenium/student_user_content_spec.rb +++ b/spec/selenium/student_user_content_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "user_content" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do diff --git a/spec/selenium/student_wiki_and_tiny_files_spec.rb b/spec/selenium/student_wiki_and_tiny_files_spec.rb index 2f0a67c38a2..02c84503403 100644 --- a/spec/selenium/student_wiki_and_tiny_files_spec.rb +++ b/spec/selenium/student_wiki_and_tiny_files_spec.rb @@ -1,7 +1,7 @@ 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 "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_file_to_rce wiki_page_tools_file_tree_setup diff --git a/spec/selenium/student_wiki_and_tiny_images_spec.rb b/spec/selenium/student_wiki_and_tiny_images_spec.rb index 8e49c89d03f..81c049dbd46 100644 --- a/spec/selenium/student_wiki_and_tiny_images_spec.rb +++ b/spec/selenium/student_wiki_and_tiny_images_spec.rb @@ -1,7 +1,7 @@ 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 "in-process server selenium tests" + include_examples "in-process server selenium tests" context "wiki and tiny images as a student" do diff --git a/spec/selenium/student_wiki_and_tiny_spec.rb b/spec/selenium/student_wiki_and_tiny_spec.rb index 4475334a90c..1cef301f5a5 100644 --- a/spec/selenium/student_wiki_and_tiny_spec.rb +++ b/spec/selenium/student_wiki_and_tiny_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common') describe "Wiki pages and Tiny WYSIWYG editor" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a student" do diff --git a/spec/selenium/teacher_rubrics_spec.rb b/spec/selenium/teacher_rubrics_spec.rb index c973c1fee8c..3903032153b 100644 --- a/spec/selenium/teacher_rubrics_spec.rb +++ b/spec/selenium/teacher_rubrics_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/rubrics_common') describe "teacher shared rubric specs" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" let(:rubric_url) { "/courses/#{@course.id}/rubrics" } let(:who_to_login) { 'teacher' } @@ -36,7 +36,7 @@ describe "teacher shared rubric specs" do end describe "course rubrics" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/teacher_scheduler_spec.rb b/spec/selenium/teacher_scheduler_spec.rb index fbc50fbf97d..80025b676a7 100644 --- a/spec/selenium/teacher_scheduler_spec.rb +++ b/spec/selenium/teacher_scheduler_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/calendar2_common') require File.expand_path(File.dirname(__FILE__) + '/helpers/scheduler_common') describe "scheduler" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do before (:each) do diff --git a/spec/selenium/teacher_section_tabs_spec.rb b/spec/selenium/teacher_section_tabs_spec.rb index cabb3ddc606..5ced300c4b2 100644 --- a/spec/selenium/teacher_section_tabs_spec.rb +++ b/spec/selenium/teacher_section_tabs_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "section tabs on the left side" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/teacher_sections_spec.rb b/spec/selenium/teacher_sections_spec.rb index a0d6f6b90aa..c42ebaa48fe 100644 --- a/spec/selenium/teacher_sections_spec.rb +++ b/spec/selenium/teacher_sections_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "sections" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/teacher_speed_grader_spec.rb b/spec/selenium/teacher_speed_grader_spec.rb index eb14a783a99..2e23d6882b8 100644 --- a/spec/selenium/teacher_speed_grader_spec.rb +++ b/spec/selenium/teacher_speed_grader_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/speed_grader_common') describe "speed grader" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do stub_kaltura diff --git a/spec/selenium/teacher_speed_grader_submission_spec.rb b/spec/selenium/teacher_speed_grader_submission_spec.rb index 5cb15fb767c..769961d02b6 100644 --- a/spec/selenium/teacher_speed_grader_submission_spec.rb +++ b/spec/selenium/teacher_speed_grader_submission_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/speed_grader_common') describe "speed grader submissions" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before (:each) do stub_kaltura diff --git a/spec/selenium/teacher_submissions_spec.rb b/spec/selenium/teacher_submissions_spec.rb index e28181aedd3..aba78a2baec 100644 --- a/spec/selenium/teacher_submissions_spec.rb +++ b/spec/selenium/teacher_submissions_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/files_common') require File.expand_path(File.dirname(__FILE__) + '/helpers/submissions_common') describe "submissions" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context 'as a teacher' do diff --git a/spec/selenium/teacher_syllabus_spec.rb b/spec/selenium/teacher_syllabus_spec.rb index 855c2051101..52bfa6a85a6 100644 --- a/spec/selenium/teacher_syllabus_spec.rb +++ b/spec/selenium/teacher_syllabus_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "course syllabus" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_assignment(title, points) #assignment data diff --git a/spec/selenium/teacher_user_lists_spec.rb b/spec/selenium/teacher_user_lists_spec.rb index 885f9767445..43f1e67a1b6 100755 --- a/spec/selenium/teacher_user_lists_spec.rb +++ b/spec/selenium/teacher_user_lists_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "user" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/teacher_wiki_and_tiny_files_spec.rb b/spec/selenium/teacher_wiki_and_tiny_files_spec.rb index b72a4da7005..359e283f033 100644 --- a/spec/selenium/teacher_wiki_and_tiny_files_spec.rb +++ b/spec/selenium/teacher_wiki_and_tiny_files_spec.rb @@ -1,7 +1,7 @@ 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 "in-process server selenium tests" + include_examples "in-process server selenium tests" def add_file_to_rce wiki_page_tools_file_tree_setup diff --git a/spec/selenium/teacher_wiki_and_tiny_images_spec.rb b/spec/selenium/teacher_wiki_and_tiny_images_spec.rb index c4130f39c13..cfc67981cfe 100644 --- a/spec/selenium/teacher_wiki_and_tiny_images_spec.rb +++ b/spec/selenium/teacher_wiki_and_tiny_images_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "Wiki pages and Tiny WYSIWYG editor Images" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" it_should_behave_like "quizzes selenium tests" context "wiki and tiny images as a teacher" do diff --git a/spec/selenium/teacher_wiki_and_tiny_spec.rb b/spec/selenium/teacher_wiki_and_tiny_spec.rb index 74e2710d46c..cc241139b4f 100644 --- a/spec/selenium/teacher_wiki_and_tiny_spec.rb +++ b/spec/selenium/teacher_wiki_and_tiny_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common') describe "Wiki pages and Tiny WYSIWYG editor" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "as a teacher" do diff --git a/spec/selenium/teacher_wiki_and_tiny_wysiwyg_spec.rb b/spec/selenium/teacher_wiki_and_tiny_wysiwyg_spec.rb index b8e9689a20b..29e74629b68 100755 --- a/spec/selenium/teacher_wiki_and_tiny_wysiwyg_spec.rb +++ b/spec/selenium/teacher_wiki_and_tiny_wysiwyg_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/wiki_and_tiny_common') describe "Wiki pages and Tiny WYSIWYG editor features" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "WYSIWYG generic as a teacher" do diff --git a/spec/selenium/terms_of_use_spec.rb b/spec/selenium/terms_of_use_spec.rb index a16a2368351..b18f8de84f5 100644 --- a/spec/selenium/terms_of_use_spec.rb +++ b/spec/selenium/terms_of_use_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "terms of use test" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" before do user_with_pseudonym(active_user: true) diff --git a/spec/selenium/users_spec.rb b/spec/selenium/users_spec.rb index f63cd607f6f..1707b875b79 100644 --- a/spec/selenium/users_spec.rb +++ b/spec/selenium/users_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "users" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" context "logins" do it "should allow setting passwords for new pseudonyms" do diff --git a/spec/selenium/wiki_pages_spec.rb b/spec/selenium/wiki_pages_spec.rb index 79ad969a602..3eb4fe72cff 100644 --- a/spec/selenium/wiki_pages_spec.rb +++ b/spec/selenium/wiki_pages_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common') describe "Navigating to wiki pages" do - it_should_behave_like "in-process server selenium tests" + include_examples "in-process server selenium tests" describe "Navigation" do before do