diff --git a/spec/apis/file_uploads_spec_helper.rb b/spec/apis/file_uploads_spec_helper.rb index 66edfb79415..df0ad5c553f 100644 --- a/spec/apis/file_uploads_spec_helper.rb +++ b/spec/apis/file_uploads_spec_helper.rb @@ -254,7 +254,7 @@ shared_examples_for "file uploads api" do end shared_examples_for "file uploads api with folders" do - it_should_behave_like "file uploads api" + include_examples "file uploads api" it "should allow specifying a folder with deprecated argument name" do preflight({ :name => "with_path.txt", :folder => "files/a/b/c/mypath" }) diff --git a/spec/apis/v1/assignments_api_spec.rb b/spec/apis/v1/assignments_api_spec.rb index dd95270e660..d9934ae2216 100644 --- a/spec/apis/v1/assignments_api_spec.rb +++ b/spec/apis/v1/assignments_api_spec.rb @@ -35,7 +35,7 @@ describe AssignmentsApiController, type: :request do api_get_assignment_in_course(locked_item, @course) end - it_should_behave_like 'a locked api item' + include_examples 'a locked api item' end def create_submitted_assignment_with_user(user=@user) diff --git a/spec/apis/v1/authentication_audit_api_spec.rb b/spec/apis/v1/authentication_audit_api_spec.rb index 4cee1d06a9b..c5d29990574 100644 --- a/spec/apis/v1/authentication_audit_api_spec.rb +++ b/spec/apis/v1/authentication_audit_api_spec.rb @@ -33,7 +33,7 @@ describe "AuthenticationAudit API", type: :request do end context "configured" do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do Setting.set('enable_page_views', 'cassandra') diff --git a/spec/apis/v1/collections_spec.rb b/spec/apis/v1/collections_spec.rb index 84753128306..ef7dda2d79b 100644 --- a/spec/apis/v1/collections_spec.rb +++ b/spec/apis/v1/collections_spec.rb @@ -197,7 +197,7 @@ describe "Collections API", type: :request do end context "a user's own collections" do - it_should_behave_like "full access to collections" + include_examples "full access to collections" it "should create a default private collection if no collections exist for the context" do @empty_user = user_with_pseudonym @@ -210,7 +210,7 @@ describe "Collections API", type: :request do end context "another user's collections" do - it_should_behave_like "public only access to collections" + include_examples "public only access to collections" end it "should not allow following your own collection" do @@ -489,7 +489,7 @@ describe "Collections API", type: :request do @group_membership = @group.add_user(@user, 'accepted', true) end - it_should_behave_like "full access to collections" + include_examples "full access to collections" end context "a group's collections, as member" do @@ -540,7 +540,7 @@ describe "Collections API", type: :request do end context "a group's collections, as a non-member" do - it_should_behave_like "public only access to collections" + include_examples "public only access to collections" end describe "following" do diff --git a/spec/apis/v1/course_audit_api_spec.rb b/spec/apis/v1/course_audit_api_spec.rb index 9739b8a6ef4..407b364977e 100644 --- a/spec/apis/v1/course_audit_api_spec.rb +++ b/spec/apis/v1/course_audit_api_spec.rb @@ -33,7 +33,7 @@ describe "CourseAudit API", type: :integration do end context "configured" do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do @request_id = UUIDSingleton.instance.generate diff --git a/spec/apis/v1/courses_api_spec.rb b/spec/apis/v1/courses_api_spec.rb index 66d8b757c92..1f1e3461f39 100644 --- a/spec/apis/v1/courses_api_spec.rb +++ b/spec/apis/v1/courses_api_spec.rb @@ -1718,8 +1718,8 @@ describe CoursesController, type: :request do context "course files" do - it_should_behave_like "file uploads api with folders" - it_should_behave_like "file uploads api with quotas" + include_examples "file uploads api with folders" + include_examples "file uploads api with quotas" before :each do @context = @course diff --git a/spec/apis/v1/discussion_topics_api_spec.rb b/spec/apis/v1/discussion_topics_api_spec.rb index 333de9bdaf8..892546eabb0 100644 --- a/spec/apis/v1/discussion_topics_api_spec.rb +++ b/spec/apis/v1/discussion_topics_api_spec.rb @@ -90,7 +90,7 @@ describe DiscussionTopicsController, type: :request do ) end - it_should_behave_like 'a locked api item' + include_examples 'a locked api item' end before(:each) do diff --git a/spec/apis/v1/external_feeds_api_spec.rb b/spec/apis/v1/external_feeds_api_spec.rb index 1b247cf1cef..ea66d2044cf 100644 --- a/spec/apis/v1/external_feeds_api_spec.rb +++ b/spec/apis/v1/external_feeds_api_spec.rb @@ -101,7 +101,7 @@ describe 'ExternalFeedsController', type: :request do end describe "in a Course" do - it_should_behave_like "Announcement External Feeds" + include_examples "Announcement External Feeds" before do @allowed_user = teacher_in_course(:active_all => true).user @context = @course @@ -112,7 +112,7 @@ describe 'ExternalFeedsController', type: :request do end describe "in a Group" do - it_should_behave_like "Announcement External Feeds" + include_examples "Announcement External Feeds" before do group_with_user(:moderator => true, :active_all => true) @allowed_user = @user diff --git a/spec/apis/v1/files_controller_api_spec.rb b/spec/apis/v1/files_controller_api_spec.rb index 85004d90a26..59bad1fcf94 100644 --- a/spec/apis/v1/files_controller_api_spec.rb +++ b/spec/apis/v1/files_controller_api_spec.rb @@ -36,7 +36,7 @@ describe "Files API", type: :request do ) end - it_should_behave_like 'a locked api item' + include_examples 'a locked api item' end before do diff --git a/spec/apis/v1/grade_change_audit_api_spec.rb b/spec/apis/v1/grade_change_audit_api_spec.rb index b0fb88109d4..4a44de71fad 100644 --- a/spec/apis/v1/grade_change_audit_api_spec.rb +++ b/spec/apis/v1/grade_change_audit_api_spec.rb @@ -34,7 +34,7 @@ describe "GradeChangeAudit API", type: :request do end context "configured" do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do @request_id = UUIDSingleton.instance.generate diff --git a/spec/apis/v1/groups_api_spec.rb b/spec/apis/v1/groups_api_spec.rb index b72aa14d474..6c5ea91a619 100644 --- a/spec/apis/v1/groups_api_spec.rb +++ b/spec/apis/v1/groups_api_spec.rb @@ -694,8 +694,8 @@ describe "Groups API", type: :request do end context "group files" do - it_should_behave_like "file uploads api with folders" - it_should_behave_like "file uploads api with quotas" + include_examples "file uploads api with folders" + include_examples "file uploads api with quotas" before do @user = @member diff --git a/spec/apis/v1/pages_api_spec.rb b/spec/apis/v1/pages_api_spec.rb index 2bff1197e3e..d4fa98957ed 100644 --- a/spec/apis/v1/pages_api_spec.rb +++ b/spec/apis/v1/pages_api_spec.rb @@ -46,7 +46,7 @@ describe "Pages API", type: :request do ) end - it_should_behave_like 'a locked api item' + include_examples 'a locked api item' end before do diff --git a/spec/apis/v1/quiz_submission_files_spec.rb b/spec/apis/v1/quiz_submission_files_spec.rb index 4a76b4d3c5b..adc9a44d482 100644 --- a/spec/apis/v1/quiz_submission_files_spec.rb +++ b/spec/apis/v1/quiz_submission_files_spec.rb @@ -31,7 +31,7 @@ describe QuizSubmissionFilesController, type: :request do s = @quiz.generate_submission(@student) end - it_should_behave_like "file uploads api" + include_examples "file uploads api" def preflight(preflight_params) json = api_call :post, diff --git a/spec/apis/v1/quiz_submissions_api_spec.rb b/spec/apis/v1/quiz_submissions_api_spec.rb index 5963864ec2a..aa3756a2b37 100644 --- a/spec/apis/v1/quiz_submissions_api_spec.rb +++ b/spec/apis/v1/quiz_submissions_api_spec.rb @@ -314,7 +314,7 @@ describe QuizSubmissionsApiController, type: :request do end context 'access validations' do - it_should_behave_like 'Quiz Submissions API Restricted Endpoints' + include_examples 'Quiz Submissions API Restricted Endpoints' before :each do @request_proxy = method(:qs_api_create) @@ -341,7 +341,7 @@ describe QuizSubmissionsApiController, type: :request do end context 'access validations' do - it_should_behave_like 'Quiz Submissions API Restricted Endpoints' + include_examples 'Quiz Submissions API Restricted Endpoints' before do @request_proxy = method(:qs_api_complete) diff --git a/spec/apis/v1/quizzes_api_spec.rb b/spec/apis/v1/quizzes_api_spec.rb index 01c06c3a20e..eca4ac3d55e 100644 --- a/spec/apis/v1/quizzes_api_spec.rb +++ b/spec/apis/v1/quizzes_api_spec.rb @@ -36,7 +36,7 @@ describe QuizzesApiController, type: :request do ) end - it_should_behave_like 'a locked api item' + include_examples 'a locked api item' end describe "GET /courses/:course_id/quizzes (index)" do diff --git a/spec/apis/v1/submission_comments_api_spec.rb b/spec/apis/v1/submission_comments_api_spec.rb index ed26211eebe..efc2e025d09 100644 --- a/spec/apis/v1/submission_comments_api_spec.rb +++ b/spec/apis/v1/submission_comments_api_spec.rb @@ -30,7 +30,7 @@ describe 'Submissions Comment API', type: :request do submission_types: "online_upload" end - it_should_behave_like "file uploads api" + include_examples "file uploads api" def has_query_exemption?; false; end def preflight(preflight_params) api_call :post, diff --git a/spec/apis/v1/submissions_api_spec.rb b/spec/apis/v1/submissions_api_spec.rb index e71ebc9c8a4..2c3fdabbc2c 100644 --- a/spec/apis/v1/submissions_api_spec.rb +++ b/spec/apis/v1/submissions_api_spec.rb @@ -2060,8 +2060,8 @@ describe 'Submissions API', type: :request do @always_scribd = true end - it_should_behave_like "file uploads api" - it_should_behave_like "file uploads api without quotas" + include_examples "file uploads api" + include_examples "file uploads api without quotas" def preflight(preflight_params) api_call(:post, "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{@student1.id}/files", diff --git a/spec/apis/v1/users_api_spec.rb b/spec/apis/v1/users_api_spec.rb index 7c67fe584a3..b295655a7f1 100644 --- a/spec/apis/v1/users_api_spec.rb +++ b/spec/apis/v1/users_api_spec.rb @@ -274,11 +274,11 @@ describe "Users API", type: :request do end end - it_should_behave_like "page view api" + include_examples "page view api" describe "cassandra page views" do - it_should_behave_like "cassandra page views" - it_should_behave_like "page view api" + include_examples "cassandra page views" + include_examples "page view api" end it "shouldn't find users in other root accounts by sis id" do @@ -763,8 +763,8 @@ describe "Users API", type: :request do @context = @user end - it_should_behave_like "file uploads api with folders" - it_should_behave_like "file uploads api with quotas" + include_examples "file uploads api with folders" + include_examples "file uploads api with quotas" def preflight(preflight_params) api_call(:post, "/api/v1/users/self/files", diff --git a/spec/controllers/page_views_controller_spec.rb b/spec/controllers/page_views_controller_spec.rb index f8f782348f2..f1eff367054 100644 --- a/spec/controllers/page_views_controller_spec.rb +++ b/spec/controllers/page_views_controller_spec.rb @@ -66,11 +66,11 @@ describe PageViewsController do before :each do Setting.set('enable_page_views', true) end - it_should_behave_like "GET 'index' as csv" + include_examples "GET 'index' as csv" end context "with cassandra page views" do - it_should_behave_like 'cassandra page views' - it_should_behave_like "GET 'index' as csv" + include_examples 'cassandra page views' + include_examples "GET 'index' as csv" end end diff --git a/spec/lib/auditors/authentication_spec.rb b/spec/lib/auditors/authentication_spec.rb index 7db426d711a..52c5f7ae41b 100644 --- a/spec/lib/auditors/authentication_spec.rb +++ b/spec/lib/auditors/authentication_spec.rb @@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../sharding_spec_helper.r require File.expand_path(File.dirname(__FILE__) + '/../../cassandra_spec_helper') describe AuthenticationAuditApiController do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do RequestContextGenerator.stubs( :request_id => 'xyz' ) diff --git a/spec/lib/auditors/course_spec.rb b/spec/lib/auditors/course_spec.rb index 6c849683172..0763b2acdd2 100644 --- a/spec/lib/auditors/course_spec.rb +++ b/spec/lib/auditors/course_spec.rb @@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../sharding_spec_helper.r require File.expand_path(File.dirname(__FILE__) + '/../../cassandra_spec_helper') describe CourseAuditApiController do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do RequestContextGenerator.stubs( :request_id => 'xyz' ) diff --git a/spec/lib/auditors/grade_change_spec.rb b/spec/lib/auditors/grade_change_spec.rb index db16365cc09..186a29f57a5 100644 --- a/spec/lib/auditors/grade_change_spec.rb +++ b/spec/lib/auditors/grade_change_spec.rb @@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../sharding_spec_helper.r require File.expand_path(File.dirname(__FILE__) + '/../../cassandra_spec_helper') describe GradeChangeAuditApiController do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do RequestContextGenerator.stubs( :request_id => 'xyz' ) diff --git a/spec/lib/canvas/icu_spec.rb b/spec/lib/canvas/icu_spec.rb index 0e28a9338f9..6bac1844da1 100644 --- a/spec/lib/canvas/icu_spec.rb +++ b/spec/lib/canvas/icu_spec.rb @@ -78,7 +78,7 @@ describe Canvas::ICU do end context "NaiveCollator" do - it_should_behave_like "Collator" + include_examples "Collator" before do Canvas::ICU.stubs(:collator).returns(Canvas::ICU::NaiveCollator) @@ -86,7 +86,7 @@ describe Canvas::ICU do end context "ICU" do - it_should_behave_like "Collator" + include_examples "Collator" before do pending if Canvas::ICU.collator == Canvas::ICU::NaiveCollator diff --git a/spec/lib/dates_overridable_spec.rb b/spec/lib/dates_overridable_spec.rb index cc05f324187..4eb097eb1cb 100644 --- a/spec/lib/dates_overridable_spec.rb +++ b/spec/lib/dates_overridable_spec.rb @@ -453,14 +453,14 @@ shared_examples_for "an object whose dates are overridable" do end describe Assignment do - it_should_behave_like "an object whose dates are overridable" + include_examples "an object whose dates are overridable" let(:overridable) { assignment_model(:due_at => 5.days.ago) } let(:overridable_type) { :assignment } end describe Quizzes::Quiz do - it_should_behave_like "an object whose dates are overridable" + include_examples "an object whose dates are overridable" let(:overridable) { quiz_model(:due_at => 5.days.ago) } let(:overridable_type) { :quiz } diff --git a/spec/lib/event_stream_spec.rb b/spec/lib/event_stream_spec.rb index bede423ebd2..5640a2475fb 100644 --- a/spec/lib/event_stream_spec.rb +++ b/spec/lib/event_stream_spec.rb @@ -406,7 +406,7 @@ describe EventStream do @database.stubs(:batch).raises(@exception) end - it_should_behave_like "recording failures" + include_examples "recording failures" end context "failing callbacks" do @@ -430,7 +430,7 @@ describe EventStream do @stream.update(@record) end - it_should_behave_like "recording failures" + include_examples "recording failures" end end end diff --git a/spec/lib/incoming_mail/directory_mailbox_spec.rb b/spec/lib/incoming_mail/directory_mailbox_spec.rb index 5f00c42d179..60c289673c1 100644 --- a/spec/lib/incoming_mail/directory_mailbox_spec.rb +++ b/spec/lib/incoming_mail/directory_mailbox_spec.rb @@ -21,7 +21,7 @@ require File.expand_path '../../../mocha_rspec_adapter', __FILE__ require File.expand_path '../mailbox_spec_helper', __FILE__ describe IncomingMail::DirectoryMailbox do - it_should_behave_like 'Mailbox' + include_examples 'Mailbox' def default_config { diff --git a/spec/lib/incoming_mail/imap_mailbox_spec.rb b/spec/lib/incoming_mail/imap_mailbox_spec.rb index c92d5cbda32..aa99959ef44 100644 --- a/spec/lib/incoming_mail/imap_mailbox_spec.rb +++ b/spec/lib/incoming_mail/imap_mailbox_spec.rb @@ -21,7 +21,7 @@ require File.expand_path('../../../mocha_rspec_adapter', __FILE__) require File.expand_path('../mailbox_spec_helper', __FILE__) describe IncomingMail::ImapMailbox do - it_should_behave_like 'Mailbox' + include_examples 'Mailbox' def default_config { diff --git a/spec/lib/incoming_mail/pop3_mailbox_spec.rb b/spec/lib/incoming_mail/pop3_mailbox_spec.rb index 66061aeaf20..d485bf6a266 100644 --- a/spec/lib/incoming_mail/pop3_mailbox_spec.rb +++ b/spec/lib/incoming_mail/pop3_mailbox_spec.rb @@ -21,7 +21,7 @@ require File.expand_path '../../../mocha_rspec_adapter', __FILE__ require File.expand_path '../mailbox_spec_helper', __FILE__ describe IncomingMail::Pop3Mailbox do - it_should_behave_like 'Mailbox' + include_examples 'Mailbox' def default_config { diff --git a/spec/lib/reporting/counts_report_spec.rb b/spec/lib/reporting/counts_report_spec.rb index aee1e443aa1..9f1f2bba0d9 100644 --- a/spec/lib/reporting/counts_report_spec.rb +++ b/spec/lib/reporting/counts_report_spec.rb @@ -38,10 +38,10 @@ describe Reporting::CountsReport do context "sharding" do specs_require_sharding - it_should_behave_like "counts_report" + include_examples "counts_report" end - it_should_behave_like "counts_report" + include_examples "counts_report" describe "detailed report" do describe "courses" do @@ -108,7 +108,7 @@ describe Reporting::CountsReport do end let(:datum) { 'teachers' } - it_should_behave_like "user_counts" + include_examples "user_counts" end describe "students" do @@ -119,7 +119,7 @@ describe Reporting::CountsReport do end let(:datum) { 'students' } - it_should_behave_like "user_counts" + include_examples "user_counts" end describe "users" do @@ -130,7 +130,7 @@ describe Reporting::CountsReport do end let(:datum) { 'users' } - it_should_behave_like "user_counts" + include_examples "user_counts" it "should include tas" do Reporting::CountsReport.process diff --git a/spec/migrations/filter_page_view_url_params_spec.rb b/spec/migrations/filter_page_view_url_params_spec.rb index 95c579cdd6e..c01f17686e7 100644 --- a/spec/migrations/filter_page_view_url_params_spec.rb +++ b/spec/migrations/filter_page_view_url_params_spec.rb @@ -32,12 +32,12 @@ describe 'DataFixup::FilterPageViewUrlParams' do end describe "db" do - it_should_behave_like 'DataFixup::FilterPageViewUrlParams' + include_examples 'DataFixup::FilterPageViewUrlParams' end describe "cassandra" do - it_should_behave_like "cassandra page views" - it_should_behave_like 'DataFixup::FilterPageViewUrlParams' + include_examples "cassandra page views" + include_examples 'DataFixup::FilterPageViewUrlParams' end end diff --git a/spec/models/account_user_spec.rb b/spec/models/account_user_spec.rb index 92fee161522..28bb0efebec 100644 --- a/spec/models/account_user_spec.rb +++ b/spec/models/account_user_spec.rb @@ -50,7 +50,7 @@ describe AccountUser do end context "non-sharded" do - it_should_behave_like "touching" + include_examples "touching" before do @account = Account.default @@ -60,7 +60,7 @@ describe AccountUser do context "sharding" do specs_require_sharding - it_should_behave_like "touching" + include_examples "touching" before do @account = @shard1.activate { Account.create! } diff --git a/spec/models/big_blue_button_conference_spec.rb b/spec/models/big_blue_button_conference_spec.rb index a82e475173f..4b9404aed73 100644 --- a/spec/models/big_blue_button_conference_spec.rb +++ b/spec/models/big_blue_button_conference_spec.rb @@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') require_relative('web_conference_spec_helper') describe BigBlueButtonConference do - it_should_behave_like 'WebConference' + include_examples 'WebConference' context "big_blue_button" do before do diff --git a/spec/models/collections_spec.rb b/spec/models/collections_spec.rb index 33d6dc50bf5..467d4541f22 100644 --- a/spec/models/collections_spec.rb +++ b/spec/models/collections_spec.rb @@ -100,7 +100,7 @@ describe 'Collections' do end describe "user collections" do - it_should_behave_like "auto-follow context" + include_examples "auto-follow context" before do @context = user_model @user = user_model @@ -109,7 +109,7 @@ describe 'Collections' do end describe "group collections as non-member" do - it_should_behave_like "auto-follow context" + include_examples "auto-follow context" before do @context = group_model @user = user_model @@ -118,7 +118,7 @@ describe 'Collections' do end describe "group collections as member" do - it_should_behave_like "auto-follow context" + include_examples "auto-follow context" before do group_with_user @context = @group diff --git a/spec/models/content_tag_spec.rb b/spec/models/content_tag_spec.rb index f02f2d162a2..b34ae142bd6 100644 --- a/spec/models/content_tag_spec.rb +++ b/spec/models/content_tag_spec.rb @@ -363,7 +363,7 @@ describe ContentTag do att.display_name.should == 'important title.txt' end - it_should_behave_like "url validation tests" + include_examples "url validation tests" it "should check url validity" do quiz = course.quizzes.create! test_url_validation(ContentTag.create!(:content => quiz, :context => @course)) diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb index 29e12717c89..76be1ccf166 100644 --- a/spec/models/conversation_spec.rb +++ b/spec/models/conversation_spec.rb @@ -231,11 +231,11 @@ describe Conversation do end end - it_should_behave_like "message counts" + include_examples "message counts" context "sharding" do specs_require_sharding - it_should_behave_like "message counts" + include_examples "message counts" end end @@ -318,10 +318,10 @@ describe Conversation do end end - it_should_behave_like "unread counts" + include_examples "unread counts" context "sharding" do specs_require_sharding - it_should_behave_like "unread counts" + include_examples "unread counts" end end diff --git a/spec/models/page_view_spec.rb b/spec/models/page_view_spec.rb index a8fbfd1a3b3..37e619b5f5c 100644 --- a/spec/models/page_view_spec.rb +++ b/spec/models/page_view_spec.rb @@ -38,7 +38,7 @@ describe PageView do end describe "cassandra page views" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should store and load from cassandra" do expect { @page_view.save! @@ -319,7 +319,7 @@ describe PageView do end context "cassandra-backed" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should return the existing page view" do page_views = (0..3).map { |index| page_view_model } @@ -354,7 +354,7 @@ describe PageView do end context "cassandra-backed" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should return the existing page view" do page_views = (0..3).map { |index| page_view_model } @@ -387,7 +387,7 @@ describe PageView do end context "cassandra-backed" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should return the existing page view" do pv = page_view_model @@ -417,7 +417,7 @@ describe PageView do end context "cassandra-backed" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should return the existing page view" do pv = page_view_model @@ -447,7 +447,7 @@ describe PageView do end context "cassandra-backed" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should return the existing page view" do pv = page_view_model @@ -499,7 +499,7 @@ describe PageView do end context "cassandra-backed" do - it_should_behave_like "cassandra page views" + include_examples "cassandra page views" it "should interpret ids relative to the default shard" do user_id = 1 diff --git a/spec/models/quiz_question/answer_parsers/fill_in_multiple_blanks_spec.rb b/spec/models/quiz_question/answer_parsers/fill_in_multiple_blanks_spec.rb index 1fc8d9ff542..86028bb8f31 100644 --- a/spec/models/quiz_question/answer_parsers/fill_in_multiple_blanks_spec.rb +++ b/spec/models/quiz_question/answer_parsers/fill_in_multiple_blanks_spec.rb @@ -47,6 +47,6 @@ describe QuizQuestion::AnswerParsers::FillInMultipleBlanks do let(:question_params) { Hash.new } let(:parser_class) { QuizQuestion::AnswerParsers::FillInMultipleBlanks } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/matching_spec.rb b/spec/models/quiz_question/answer_parsers/matching_spec.rb index 59b2c3653b7..447df3ea498 100644 --- a/spec/models/quiz_question/answer_parsers/matching_spec.rb +++ b/spec/models/quiz_question/answer_parsers/matching_spec.rb @@ -59,7 +59,7 @@ describe QuizQuestion::AnswerParsers::Matching do let(:parser_class) { QuizQuestion::AnswerParsers::Matching } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/missing_word_spec.rb b/spec/models/quiz_question/answer_parsers/missing_word_spec.rb index 1eb2d16042f..2659e00898a 100644 --- a/spec/models/quiz_question/answer_parsers/missing_word_spec.rb +++ b/spec/models/quiz_question/answer_parsers/missing_word_spec.rb @@ -49,7 +49,7 @@ describe QuizQuestion::AnswerParsers::MissingWord do let(:parser_class) { QuizQuestion::AnswerParsers::MissingWord } context "in general" do - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end context "with no answer specified as correct" do diff --git a/spec/models/quiz_question/answer_parsers/multiple_answers_spec.rb b/spec/models/quiz_question/answer_parsers/multiple_answers_spec.rb index cae3d7d080d..57dd25666ae 100644 --- a/spec/models/quiz_question/answer_parsers/multiple_answers_spec.rb +++ b/spec/models/quiz_question/answer_parsers/multiple_answers_spec.rb @@ -48,7 +48,7 @@ describe QuizQuestion::AnswerParsers::MultipleAnswers do let(:question_params) { Hash.new } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/multiple_choice_spec.rb b/spec/models/quiz_question/answer_parsers/multiple_choice_spec.rb index 3891eddf22c..9f61e85ee7e 100644 --- a/spec/models/quiz_question/answer_parsers/multiple_choice_spec.rb +++ b/spec/models/quiz_question/answer_parsers/multiple_choice_spec.rb @@ -50,7 +50,7 @@ describe QuizQuestion::AnswerParsers::MultipleChoice do let(:question_params) { Hash.new } let(:parser_class) { QuizQuestion::AnswerParsers::MultipleChoice } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/multiple_dropdowns_spec.rb b/spec/models/quiz_question/answer_parsers/multiple_dropdowns_spec.rb index c87962f7392..a6f7c4999a6 100644 --- a/spec/models/quiz_question/answer_parsers/multiple_dropdowns_spec.rb +++ b/spec/models/quiz_question/answer_parsers/multiple_dropdowns_spec.rb @@ -50,7 +50,7 @@ describe QuizQuestion::AnswerParsers::MultipleDropdowns do let(:question_params) { Hash.new } let(:parser_class) { QuizQuestion::AnswerParsers::MultipleDropdowns } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/numerical_spec.rb b/spec/models/quiz_question/answer_parsers/numerical_spec.rb index 07f8b1b010f..9e307816d61 100644 --- a/spec/models/quiz_question/answer_parsers/numerical_spec.rb +++ b/spec/models/quiz_question/answer_parsers/numerical_spec.rb @@ -47,6 +47,6 @@ describe QuizQuestion::AnswerParsers::Numerical do let(:question_params) { Hash.new } let(:parser_class) { QuizQuestion::AnswerParsers::Numerical } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/short_answer_spec.rb b/spec/models/quiz_question/answer_parsers/short_answer_spec.rb index d694e406ccf..4764af660f5 100644 --- a/spec/models/quiz_question/answer_parsers/short_answer_spec.rb +++ b/spec/models/quiz_question/answer_parsers/short_answer_spec.rb @@ -47,7 +47,7 @@ describe QuizQuestion::AnswerParsers::ShortAnswer do let(:question_params) { Hash.new } let(:parser_class) { QuizQuestion::AnswerParsers::ShortAnswer } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_parsers/true_false_spec.rb b/spec/models/quiz_question/answer_parsers/true_false_spec.rb index e269ccc0856..eb90e7968ae 100644 --- a/spec/models/quiz_question/answer_parsers/true_false_spec.rb +++ b/spec/models/quiz_question/answer_parsers/true_false_spec.rb @@ -47,7 +47,7 @@ describe QuizQuestion::AnswerParsers::TrueFalse do let(:question_params) { Hash.new } let(:parser_class) { QuizQuestion::AnswerParsers::TrueFalse } - it_should_behave_like "All answer parsers" + include_examples "All answer parsers" end end diff --git a/spec/models/quiz_question/answer_serializers/essay_spec.rb b/spec/models/quiz_question/answer_serializers/essay_spec.rb index ab92d5a55d6..5ef2ff42707 100644 --- a/spec/models/quiz_question/answer_serializers/essay_spec.rb +++ b/spec/models/quiz_question/answer_serializers/essay_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_s require File.expand_path(File.dirname(__FILE__) + '/support/textual_answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::Essay do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :input do 'Hello World!' @@ -20,6 +20,6 @@ describe QuizQuestion::AnswerSerializers::Essay do end context 'validations' do - it_should_behave_like 'Textual Answer Serializers' + include_examples 'Textual Answer Serializers' end end \ No newline at end of file diff --git a/spec/models/quiz_question/answer_serializers/fill_in_multiple_blanks_spec.rb b/spec/models/quiz_question/answer_serializers/fill_in_multiple_blanks_spec.rb index 61b697fd6ef..d6e10b21691 100644 --- a/spec/models/quiz_question/answer_serializers/fill_in_multiple_blanks_spec.rb +++ b/spec/models/quiz_question/answer_serializers/fill_in_multiple_blanks_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_s require File.expand_path(File.dirname(__FILE__) + '/support/textual_answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::FillInMultipleBlanks do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :input do { @@ -38,7 +38,7 @@ describe QuizQuestion::AnswerSerializers::FillInMultipleBlanks do end context 'validations' do - it_should_behave_like 'Textual Answer Serializers' + include_examples 'Textual Answer Serializers' it 'should reject unexpected types' do [ 'asdf', nil ].each do |bad_input| diff --git a/spec/models/quiz_question/answer_serializers/matching_spec.rb b/spec/models/quiz_question/answer_serializers/matching_spec.rb index f104191cb1e..4e34b15e7b6 100644 --- a/spec/models/quiz_question/answer_serializers/matching_spec.rb +++ b/spec/models/quiz_question/answer_serializers/matching_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb') require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::Matching do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :input do [ diff --git a/spec/models/quiz_question/answer_serializers/multiple_answers_spec.rb b/spec/models/quiz_question/answer_serializers/multiple_answers_spec.rb index c57fdc58d46..59bbc040bef 100644 --- a/spec/models/quiz_question/answer_serializers/multiple_answers_spec.rb +++ b/spec/models/quiz_question/answer_serializers/multiple_answers_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_s require File.expand_path(File.dirname(__FILE__) + '/support/id_answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::MultipleAnswers do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :factory_options do { @@ -35,7 +35,7 @@ describe QuizQuestion::AnswerSerializers::MultipleAnswers do end context 'validations' do - it_should_behave_like 'Id Answer Serializers' + include_examples 'Id Answer Serializers' it 'should reject unexpected types' do [ nil, 'asdf' ].each do |bad_input| diff --git a/spec/models/quiz_question/answer_serializers/multiple_choice_spec.rb b/spec/models/quiz_question/answer_serializers/multiple_choice_spec.rb index 888a32a99fc..9f48c348e9f 100644 --- a/spec/models/quiz_question/answer_serializers/multiple_choice_spec.rb +++ b/spec/models/quiz_question/answer_serializers/multiple_choice_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_s require File.expand_path(File.dirname(__FILE__) + '/support/id_answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::MultipleChoice do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :input do 2405 @@ -16,6 +16,6 @@ describe QuizQuestion::AnswerSerializers::MultipleChoice do end context 'validations' do - it_should_behave_like 'Id Answer Serializers' + include_examples 'Id Answer Serializers' end end diff --git a/spec/models/quiz_question/answer_serializers/multiple_dropdowns_spec.rb b/spec/models/quiz_question/answer_serializers/multiple_dropdowns_spec.rb index ed7a1936711..ea7ee579d1d 100644 --- a/spec/models/quiz_question/answer_serializers/multiple_dropdowns_spec.rb +++ b/spec/models/quiz_question/answer_serializers/multiple_dropdowns_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_s require File.expand_path(File.dirname(__FILE__) + '/support/id_answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::MultipleDropdowns do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :input do { @@ -25,7 +25,7 @@ describe QuizQuestion::AnswerSerializers::MultipleDropdowns do end context 'validations' do - it_should_behave_like 'Id Answer Serializers' + include_examples 'Id Answer Serializers' it 'should reject an answer for an unknown blank' do rc = subject.serialize({ foobar: 123456 }) diff --git a/spec/models/quiz_question/answer_serializers/numerical_spec.rb b/spec/models/quiz_question/answer_serializers/numerical_spec.rb index bdc96657c96..ea2267d920f 100644 --- a/spec/models/quiz_question/answer_serializers/numerical_spec.rb +++ b/spec/models/quiz_question/answer_serializers/numerical_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb') require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::Numerical do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :inputs do [ 25.3, 25e-6, '0.12', '3' ] diff --git a/spec/models/quiz_question/answer_serializers/short_answer_spec.rb b/spec/models/quiz_question/answer_serializers/short_answer_spec.rb index 7bb68d57782..9407c2c6810 100644 --- a/spec/models/quiz_question/answer_serializers/short_answer_spec.rb +++ b/spec/models/quiz_question/answer_serializers/short_answer_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/support/answer_serializers_s require File.expand_path(File.dirname(__FILE__) + '/support/textual_answer_serializers_specs.rb') describe QuizQuestion::AnswerSerializers::ShortAnswer do - it_should_behave_like 'Answer Serializers' + include_examples 'Answer Serializers' let :input do 'hello world!' @@ -26,6 +26,6 @@ describe QuizQuestion::AnswerSerializers::ShortAnswer do end context 'validations' do - it_should_behave_like 'Textual Answer Serializers' + include_examples 'Textual Answer Serializers' end end diff --git a/spec/models/quiz_statistics/item_analysis_spec.rb b/spec/models/quiz_statistics/item_analysis_spec.rb index 97e889c9e71..6b8198ad26c 100644 --- a/spec/models/quiz_statistics/item_analysis_spec.rb +++ b/spec/models/quiz_statistics/item_analysis_spec.rb @@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common.rb') describe QuizStatistics::ItemAnalysis do let(:report_type) { 'item_analysis' } - it_should_behave_like "QuizStatistics::Report" + include_examples "QuizStatistics::Report" end describe QuizStatistics::ItemAnalysis do diff --git a/spec/models/quiz_statistics/student_analysis_spec.rb b/spec/models/quiz_statistics/student_analysis_spec.rb index 70c7f3dcc90..29ede840c04 100644 --- a/spec/models/quiz_statistics/student_analysis_spec.rb +++ b/spec/models/quiz_statistics/student_analysis_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/common.rb') describe QuizStatistics::StudentAnalysis do let(:report_type) { 'student_analysis' } - it_should_behave_like "QuizStatistics::Report" + include_examples "QuizStatistics::Report" end describe QuizStatistics::StudentAnalysis do diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb index 2cc137e9bc4..29f65a0f5f5 100644 --- a/spec/models/submission_spec.rb +++ b/spec/models/submission_spec.rb @@ -39,7 +39,7 @@ describe Submission do Submission.create!(@valid_attributes) end - it_should_behave_like "url validation tests" + include_examples "url validation tests" it "should check url validity" do test_url_validation(Submission.create!(@valid_attributes)) end diff --git a/spec/models/user_follow_spec.rb b/spec/models/user_follow_spec.rb index 92b99816a52..86e4c6ddd51 100644 --- a/spec/models/user_follow_spec.rb +++ b/spec/models/user_follow_spec.rb @@ -110,7 +110,7 @@ describe "UserFollow" do end context "follow from user shard" do - it_should_behave_like "sharded user following" + include_examples "sharded user following" before do @uf = UserFollow.create_follow(@user1, @collection) @@ -119,7 +119,7 @@ describe "UserFollow" do end context "follow from thing shard" do - it_should_behave_like "sharded user following" + include_examples "sharded user following" before do @uf = @collection.shard.activate { UserFollow.create_follow(@user1, @collection) } @@ -128,7 +128,7 @@ describe "UserFollow" do end context "follow from a third shard" do - it_should_behave_like "sharded user following" + include_examples "sharded user following" before do @uf = @shard2.activate { UserFollow.create_follow(@user1, @collection) } diff --git a/spec/models/wimba_conference_spec.rb b/spec/models/wimba_conference_spec.rb index 3b323a2e773..b390fe1d9fe 100644 --- a/spec/models/wimba_conference_spec.rb +++ b/spec/models/wimba_conference_spec.rb @@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') require_relative('web_conference_spec_helper') describe WimbaConference do - it_should_behave_like 'WebConference' + include_examples 'WebConference' # implements this WebConference option: it { should respond_to :admin_settings_url } diff --git a/spec/selenium/admin/account_admin_question_banks_spec.rb b/spec/selenium/admin/account_admin_question_banks_spec.rb index 037ca7a8ca8..12d1c1699f3 100755 --- a/spec/selenium/admin/account_admin_question_banks_spec.rb +++ b/spec/selenium/admin/account_admin_question_banks_spec.rb @@ -4,6 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../helpers/basic/question_ba describe "account admin question banks" do describe "shared question bank specs" do let(:url) { "/accounts/#{Account.default.id}/question_banks" } - it_should_behave_like "question bank basic tests" + include_examples "question bank basic tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/account_admin_statistics_spec.rb b/spec/selenium/admin/account_admin_statistics_spec.rb index d33ed4e8bbe..1ab67859e1e 100644 --- a/spec/selenium/admin/account_admin_statistics_spec.rb +++ b/spec/selenium/admin/account_admin_statistics_spec.rb @@ -6,6 +6,6 @@ describe "account admin statistics" do let(:url) { "/accounts/#{Account.default.id}/statistics" } let(:account) { Account.default } let(:list_css) { {:created => '#recently_created_item_list', :started => '#recently_started_item_list', :ended => '#recently_ended_item_list', :logged_in => '#recently_logged_in_item_list'} } - it_should_behave_like "statistics basic tests" + include_examples "statistics basic tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/admin_settings_spec.rb b/spec/selenium/admin/admin_settings_spec.rb index 8a5421dfa14..fe67e6f39e0 100644 --- a/spec/selenium/admin/admin_settings_spec.rb +++ b/spec/selenium/admin/admin_settings_spec.rb @@ -46,7 +46,7 @@ describe "settings tabs" do end describe "site admin" do - it_should_behave_like "external tools tests" + include_examples "external tools tests" before(:each) do # course_with_ site_admin_logged_in @@ -85,7 +85,7 @@ describe "settings tabs" do end describe "admin" do - it_should_behave_like "external tools tests" + include_examples "external tools tests" before(:each) do course_with_admin_logged_in get "/accounts/#{Account.default.id}/settings" @@ -194,6 +194,6 @@ describe 'shared settings specs' do let(:account) { Account.default } let(:account_settings_url) { "/accounts/#{Account.default.id}/settings" } let(:admin_tab_url) { "/accounts/#{Account.default.id}/settings#tab-users" } - it_should_behave_like "settings basic tests" + include_examples "settings basic tests" end end diff --git a/spec/selenium/admin/admin_users_spec.rb b/spec/selenium/admin/admin_users_spec.rb index b3f5394fd90..22eaca067a4 100755 --- a/spec/selenium/admin/admin_users_spec.rb +++ b/spec/selenium/admin/admin_users_spec.rb @@ -10,7 +10,7 @@ describe "admin courses tab" do let(:account) { Account.default } let(:url) { "/accounts/#{account.id}/users" } let(:opts) { {:name => 'student'} } - it_should_behave_like "users basic tests" + include_examples "users basic tests" end end diff --git a/spec/selenium/admin/site_admin_permissions_spec.rb b/spec/selenium/admin/site_admin_permissions_spec.rb index 16ff561cb88..db943d172fe 100755 --- a/spec/selenium/admin/site_admin_permissions_spec.rb +++ b/spec/selenium/admin/site_admin_permissions_spec.rb @@ -6,6 +6,6 @@ describe "account permissions" do describe "shared permission specs" do let(:url) { "/accounts/#{Account.default.id}/permissions?account_roles=1" } let(:account) { Account.default } - it_should_behave_like "permission tests" + include_examples "permission tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/sub_accounts/permissions_spec.rb b/spec/selenium/admin/sub_accounts/permissions_spec.rb index c208dc4befc..be658018da2 100644 --- a/spec/selenium/admin/sub_accounts/permissions_spec.rb +++ b/spec/selenium/admin/sub_accounts/permissions_spec.rb @@ -5,6 +5,6 @@ describe "sub account permissions" do describe "shared permission specs" do let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:url) { "/accounts/#{account.id}/permissions?account_roles=1" } - it_should_behave_like "permission tests" + include_examples "permission tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/sub_accounts/question_banks_spec.rb b/spec/selenium/admin/sub_accounts/question_banks_spec.rb index 90029d01ea5..880f321c387 100644 --- a/spec/selenium/admin/sub_accounts/question_banks_spec.rb +++ b/spec/selenium/admin/sub_accounts/question_banks_spec.rb @@ -5,6 +5,6 @@ describe "sub account question banks" do describe "shared question bank specs" do let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:url) { "/accounts/#{account.id}/question_banks" } - it_should_behave_like "question bank basic tests" + include_examples "question bank basic tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/sub_accounts/settings_spec.rb b/spec/selenium/admin/sub_accounts/settings_spec.rb index cb82d77997d..1fdefa0640f 100644 --- a/spec/selenium/admin/sub_accounts/settings_spec.rb +++ b/spec/selenium/admin/sub_accounts/settings_spec.rb @@ -6,6 +6,6 @@ describe "sub account settings" do let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:account_settings_url) { "/accounts/#{account.id}/settings" } let(:admin_tab_url) { "/accounts/#{account.id}/settings#tab-users" } - it_should_behave_like "settings basic tests" + include_examples "settings basic tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/sub_accounts/statistics_spec.rb b/spec/selenium/admin/sub_accounts/statistics_spec.rb index 3ea7b2b03e7..72ff5a5856d 100644 --- a/spec/selenium/admin/sub_accounts/statistics_spec.rb +++ b/spec/selenium/admin/sub_accounts/statistics_spec.rb @@ -6,6 +6,6 @@ describe "sub account statistics" do let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:url) { "/accounts/#{account.id}/statistics" } let(:list_css) { {:started => '#recently_started_item_list', :ended => '#recently_ended_item_list', :logged_in => '#recently_logged_in_item_list'} } - it_should_behave_like "statistics basic tests" + include_examples "statistics basic tests" end end \ No newline at end of file diff --git a/spec/selenium/admin/sub_accounts/users_spec.rb b/spec/selenium/admin/sub_accounts/users_spec.rb index 12d7f78c88f..ef037a33141 100644 --- a/spec/selenium/admin/sub_accounts/users_spec.rb +++ b/spec/selenium/admin/sub_accounts/users_spec.rb @@ -6,6 +6,6 @@ describe "sub account users" do let(:account) { Account.create(:name => 'sub account from default account', :parent_account => Account.default) } let(:url) { "/accounts/#{account.id}/users" } let(:opts) { {:name => 'student'} } - it_should_behave_like "users basic tests" + include_examples "users basic tests" end end \ No newline at end of file diff --git a/spec/selenium/admin_tools_spec.rb b/spec/selenium/admin_tools_spec.rb index 837f01027ce..073048f3b43 100644 --- a/spec/selenium/admin_tools_spec.rb +++ b/spec/selenium/admin_tools_spec.rb @@ -173,7 +173,7 @@ describe "admin_tools" do end context "Logging" do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" it "should change log types with dropdown" do load_admin_tools_page @@ -275,7 +275,7 @@ describe "admin_tools" do end context "Authentication Logging" do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do Auditors::Authentication.record(@student.pseudonyms.first, 'login') @@ -304,7 +304,7 @@ describe "admin_tools" do end context "Grade Change Logging" do - it_should_behave_like "cassandra audit logs" + include_examples "cassandra audit logs" before do course_with_teacher(course: @course, :user => user_with_pseudonym(:name => 'Teacher TestUser')) diff --git a/spec/selenium/common.rb b/spec/selenium/common.rb index 00c37b47069..8f00fc475c2 100644 --- a/spec/selenium/common.rb +++ b/spec/selenium/common.rb @@ -16,15 +16,6 @@ # 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" diff --git a/spec/selenium/equation_spec.rb b/spec/selenium/equation_spec.rb index ceb67994c49..29bdec43eed 100644 --- a/spec/selenium/equation_spec.rb +++ b/spec/selenium/equation_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "equation editor" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" it "should support multiple equation editors on the same page" do pending("193") diff --git a/spec/selenium/external_tools_spec.rb b/spec/selenium/external_tools_spec.rb index 249c1a567f7..a8f7c298c55 100644 --- a/spec/selenium/external_tools_spec.rb +++ b/spec/selenium/external_tools_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/external_tools_common') describe "external tools" do - it_should_behave_like "external tools tests" + include_examples "external tools tests" describe "app center" do before (:each) do @@ -97,7 +97,7 @@ describe "external tools" do end describe "editing external tools" do - it_should_behave_like "external tools tests" + include_examples "external tools tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/public_courses_spec.rb b/spec/selenium/public_courses_spec.rb index 55a0e7c422f..e40313280e2 100644 --- a/spec/selenium/public_courses_spec.rb +++ b/spec/selenium/public_courses_spec.rb @@ -93,7 +93,7 @@ describe "public courses" do @course end - it_should_behave_like 'a public course' + include_examples 'a public course' end context 'with draft state enabled' do @@ -104,7 +104,7 @@ describe "public courses" do @course end - it_should_behave_like 'a public course' + include_examples 'a public course' end end end diff --git a/spec/selenium/quizzes_attempts_spec.rb b/spec/selenium/quizzes_attempts_spec.rb index 8b03d33d788..65f9494a31e 100644 --- a/spec/selenium/quizzes_attempts_spec.rb +++ b/spec/selenium/quizzes_attempts_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quizzes attempts" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/quizzes_one_question_at_a_time_spec.rb b/spec/selenium/quizzes_one_question_at_a_time_spec.rb index 014a58fb345..ebf88ef29ac 100644 --- a/spec/selenium/quizzes_one_question_at_a_time_spec.rb +++ b/spec/selenium/quizzes_one_question_at_a_time_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "One Question at a Time Quizzes" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" def create_oqaat_quiz(opts={}) diff --git a/spec/selenium/quizzes_question_banks_spec.rb b/spec/selenium/quizzes_question_banks_spec.rb index 6acaaaf5457..8c2a80d7568 100644 --- a/spec/selenium/quizzes_question_banks_spec.rb +++ b/spec/selenium/quizzes_question_banks_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quizzes question banks" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/quizzes_question_creation_spec.rb b/spec/selenium/quizzes_question_creation_spec.rb index 9c8b3e5cfe7..31566454a05 100644 --- a/spec/selenium/quizzes_question_creation_spec.rb +++ b/spec/selenium/quizzes_question_creation_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quizzes question creation" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/self_enrollment_spec.rb b/spec/selenium/self_enrollment_spec.rb index 10586bf85fa..c1315bff249 100644 --- a/spec/selenium/self_enrollment_spec.rb +++ b/spec/selenium/self_enrollment_spec.rb @@ -113,10 +113,10 @@ describe "self enrollment" do } context "with open registration" do - it_should_behave_like "open registration" + include_examples "open registration" end context "without open registration" do - it_should_behave_like "closed registration" + include_examples "closed registration" end end @@ -133,10 +133,10 @@ describe "self enrollment" do f('#dashboard').should include_text("You've enrolled in one or more courses that have not started yet") } context "with open registration" do - it_should_behave_like "open registration" + include_examples "open registration" end context "without open registration" do - it_should_behave_like "closed registration" + include_examples "closed registration" end end @@ -149,10 +149,10 @@ describe "self enrollment" do f('#dashboard').should include_text("You've enrolled in one or more courses that have not started yet") } context "with open registration" do - it_should_behave_like "open registration" + include_examples "open registration" end context "without open registration" do - it_should_behave_like "closed registration" + include_examples "closed registration" end end diff --git a/spec/selenium/student_quizzes_spec.rb b/spec/selenium/student_quizzes_spec.rb index 8826dd87dd4..0b91ad2e846 100644 --- a/spec/selenium/student_quizzes_spec.rb +++ b/spec/selenium/student_quizzes_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quizzes" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" def prepare_quiz @quiz = quiz_model({ diff --git a/spec/selenium/teacher_quizzes_questions_spec.rb b/spec/selenium/teacher_quizzes_questions_spec.rb index 31c507c31e5..d0bb91412f2 100644 --- a/spec/selenium/teacher_quizzes_questions_spec.rb +++ b/spec/selenium/teacher_quizzes_questions_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quizzes questions" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" before (:each) do course_with_teacher_logged_in diff --git a/spec/selenium/teacher_quizzes_spec.rb b/spec/selenium/teacher_quizzes_spec.rb index 869bccc00aa..ee9826dbb8b 100644 --- a/spec/selenium/teacher_quizzes_spec.rb +++ b/spec/selenium/teacher_quizzes_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/assignment_overrides describe "quizzes" do include AssignmentOverridesSeleniumHelper - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" context "as a teacher" do let(:due_at) { Time.zone.now } diff --git a/spec/selenium/teacher_quizzes_statistics_spec.rb b/spec/selenium/teacher_quizzes_statistics_spec.rb index f23e2fea8fc..aebe77eff73 100644 --- a/spec/selenium/teacher_quizzes_statistics_spec.rb +++ b/spec/selenium/teacher_quizzes_statistics_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quiz statistics" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" describe "item analysis" do diff --git a/spec/selenium/teacher_quizzes_students_spec.rb b/spec/selenium/teacher_quizzes_students_spec.rb index 4426bfb613c..6301e7714cc 100644 --- a/spec/selenium/teacher_quizzes_students_spec.rb +++ b/spec/selenium/teacher_quizzes_students_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "quizzes students" do - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" context "as a teacher " do diff --git a/spec/selenium/teacher_wiki_and_tiny_images_spec.rb b/spec/selenium/teacher_wiki_and_tiny_images_spec.rb index 17c82bbbee1..cdf5a51fbc9 100644 --- a/spec/selenium/teacher_wiki_and_tiny_images_spec.rb +++ b/spec/selenium/teacher_wiki_and_tiny_images_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helpers/quizzes_common') describe "Wiki pages and Tiny WYSIWYG editor Images" do include_examples "in-process server selenium tests" - it_should_behave_like "quizzes selenium tests" + include_examples "quizzes selenium tests" context "wiki and tiny images as a teacher" do diff --git a/spec/services/quiz_submission_service_spec.rb b/spec/services/quiz_submission_service_spec.rb index 07396426f75..d2ea2b17e13 100644 --- a/spec/services/quiz_submission_service_spec.rb +++ b/spec/services/quiz_submission_service_spec.rb @@ -88,7 +88,7 @@ describe QuizSubmissionService do lambda { |*_| subject.create quiz } end - it_should_behave_like 'Takeable Quiz Services' + include_examples 'Takeable Quiz Services' it 'should create a QS' do expect { subject.create quiz }.to_not raise_error @@ -171,7 +171,7 @@ describe QuizSubmissionService do lambda { |*_| subject.complete qs, qs.attempt } end - it_should_behave_like 'Takeable Quiz Services' + include_examples 'Takeable Quiz Services' it 'should complete the QS' do expect do @@ -240,7 +240,7 @@ describe QuizSubmissionService do lambda { |*_| subject.update_question({}, qs, qs.attempt) } end - it_should_behave_like 'Takeable Quiz Services' + include_examples 'Takeable Quiz Services' it 'should update a question' do expect do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cb7a72df816..e4b3b2d4dde 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.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 + begin; require File.expand_path(File.dirname(__FILE__) + "/../parallelized_specs/lib/parallelized_specs.rb"); rescue LoadError; end ENV["RAILS_ENV"] = 'test' diff --git a/spec/views/communication_channels/confirm.html.erb_spec.rb b/spec/views/communication_channels/confirm.html.erb_spec.rb index 923ad384cab..4ef77181543 100644 --- a/spec/views/communication_channels/confirm.html.erb_spec.rb +++ b/spec/views/communication_channels/confirm.html.erb_spec.rb @@ -176,7 +176,7 @@ describe "communication_channels/confirm.html.erb" do @user.update_attribute(:workflow_state, 'creation_pending') assigns[:pseudonym] = @user.pseudonyms.build(:account => Account.default) end - it_should_behave_like "user registration" + include_examples "user registration" end end @@ -240,6 +240,6 @@ describe "communication_channels/confirm.html.erb" do assigns[:pseudonym] = @user.pseudonyms.create!(:unique_id => 'johndoe@example.com') end - it_should_behave_like "user registration" + include_examples "user registration" end end diff --git a/vendor/plugins/delayed_job/spec_canvas/active_record_job_spec.rb b/vendor/plugins/delayed_job/spec_canvas/active_record_job_spec.rb index 23dcdeb59e8..f11eeb11cf2 100644 --- a/vendor/plugins/delayed_job/spec_canvas/active_record_job_spec.rb +++ b/vendor/plugins/delayed_job/spec_canvas/active_record_job_spec.rb @@ -17,7 +17,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do Delayed::Job::Failed.delete_all end - it_should_behave_like 'a delayed_jobs implementation' + include_examples 'a delayed_jobs implementation' it "should recover as well as possible from a failure failing a job" do Delayed::Job::Failed.stubs(:create).raises(RuntimeError) diff --git a/vendor/plugins/delayed_job/spec_canvas/delayed_batch_spec.rb b/vendor/plugins/delayed_job/spec_canvas/delayed_batch_spec.rb index 2ccd72e976a..ce7ad0e90f6 100644 --- a/vendor/plugins/delayed_job/spec_canvas/delayed_batch_spec.rb +++ b/vendor/plugins/delayed_job/spec_canvas/delayed_batch_spec.rb @@ -105,11 +105,11 @@ shared_examples_for 'Delayed::Batch' do end describe "current_shard" do - it_should_behave_like "delayed_jobs_shards" + include_examples "delayed_jobs_shards" context "sharding" do specs_require_sharding - it_should_behave_like "delayed_jobs_shards" + include_examples "delayed_jobs_shards" end end end diff --git a/vendor/plugins/delayed_job/spec_canvas/redis_job_spec.rb b/vendor/plugins/delayed_job/spec_canvas/redis_job_spec.rb index 8629a6b4cc6..b19e0ee4a6a 100644 --- a/vendor/plugins/delayed_job/spec_canvas/redis_job_spec.rb +++ b/vendor/plugins/delayed_job/spec_canvas/redis_job_spec.rb @@ -19,7 +19,7 @@ describe 'Delayed::Backend::Redis::Job' do Delayed::Job.redis.flushdb end - it_should_behave_like 'a delayed_jobs implementation' + include_examples 'a delayed_jobs implementation' describe "tickle_strand" do it "should continue trying to tickle until the strand is empty" do diff --git a/vendor/plugins/delayed_job/spec_canvas/shared_backend_spec.rb b/vendor/plugins/delayed_job/spec_canvas/shared_backend_spec.rb index 8c3abb0f2b3..e1b36d0ffa3 100644 --- a/vendor/plugins/delayed_job/spec_canvas/shared_backend_spec.rb +++ b/vendor/plugins/delayed_job/spec_canvas/shared_backend_spec.rb @@ -636,7 +636,7 @@ shared_examples_for 'a backend' do end describe "scope: current" do - it_should_behave_like "scope" + include_examples "scope" before do @flavor = 'current' Timecop.freeze(5.minutes.ago) do @@ -648,7 +648,7 @@ shared_examples_for 'a backend' do end describe "scope: future" do - it_should_behave_like "scope" + include_examples "scope" before do @flavor = 'future' Timecop.freeze(5.minutes.ago) do @@ -660,7 +660,7 @@ shared_examples_for 'a backend' do end describe "scope: strand" do - it_should_behave_like "scope" + include_examples "scope" before do @flavor = 'strand' @query = 's1' @@ -675,7 +675,7 @@ shared_examples_for 'a backend' do end describe "scope: tag" do - it_should_behave_like "scope" + include_examples "scope" before do @flavor = 'tag' @query = 'String#to_i' diff --git a/vendor/plugins/delayed_job/spec_canvas/shared_jobs_spec.rb b/vendor/plugins/delayed_job/spec_canvas/shared_jobs_spec.rb index 8f1d1519875..6c3d6883963 100644 --- a/vendor/plugins/delayed_job/spec_canvas/shared_jobs_spec.rb +++ b/vendor/plugins/delayed_job/spec_canvas/shared_jobs_spec.rb @@ -6,10 +6,10 @@ require File.expand_path('../stats_spec', __FILE__) require File.expand_path('../worker_spec', __FILE__) shared_examples_for 'a delayed_jobs implementation' do - it_should_behave_like 'a backend' - it_should_behave_like 'Delayed::Batch' - it_should_behave_like 'random ruby objects' - it_should_behave_like 'Delayed::PerformableMethod' - it_should_behave_like 'Delayed::Stats' - it_should_behave_like 'Delayed::Worker' + include_examples 'a backend' + include_examples 'Delayed::Batch' + include_examples 'random ruby objects' + include_examples 'Delayed::PerformableMethod' + include_examples 'Delayed::Stats' + include_examples 'Delayed::Worker' end diff --git a/vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb b/vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb index 0c8e1e4b1b2..c4376f1dfd8 100644 --- a/vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb +++ b/vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb @@ -6,7 +6,7 @@ module Wiziq describe WiziqConference do include Wiziq - it_should_behave_like 'WebConference' + include_examples 'WebConference' before(:each) do PluginSetting.create!(:name => 'wiziq', :settings => { :api_url => 'http://wiziq.com/', :access_key => 'test_access_key', :secret_key => 'test_secret_key' })