integration specs are request specs in rspec2

Change-Id: Iffee4243a9fa27e43f7020919a18777031e9724f
Reviewed-on: https://gerrit.instructure.com/28833
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

spec/apis/auth_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../sharding_spec_helper')
 
-describe "API Authentication", :type => :integration do
+describe "API Authentication", type: :request do
 
   before do
     @key = DeveloperKey.create!

spec/apis/error_handling_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/api_spec_helper')
 
-describe "API Error Handling", :type => :integration do
+describe "API Error Handling", type: :request do
   before do
     user_with_pseudonym(:active_all => true)
     @token = @user.access_tokens.create!

spec/apis/general_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/api_spec_helper')
 
-describe "API", :type => :integration do
+describe "API", type: :request do
   describe "Api::V1::Json" do
     it "should merge user options with the default api behavior" do
       obj = Object.new

spec/apis/lti/grade_passback_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe LtiApiController, :type => :integration do
+describe LtiApiController, type: :request do
   before do
     course_with_student(:active_all => true)
     @student = @user

spec/apis/user_content_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/api_spec_helper')
 
-describe UserContent, :type => :integration do
+describe UserContent, type: :request do
   it "should translate course file download links to directly-downloadable urls" do
     course_with_teacher_logged_in(:active_all => true)
     attachment_model

spec/apis/v1/account_authorization_configs_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "AccountAuthorizationConfigs API", :type => :integration do
+describe "AccountAuthorizationConfigs API", type: :request do
   before do
     @account = account_model(:name => 'root')
     user_with_pseudonym(:active_all => true, :account => @account)

spec/apis/v1/account_authorization_configs_deprecated_api_spec.rb

@@ -19,7 +19,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "AccountAuthorizationConfigs API", :type => :integration do
+describe "AccountAuthorizationConfigs API", type: :request do
   before do
     @account = account_model(:name => 'root')
     user_with_pseudonym(:active_all => true, :account => @account)

spec/apis/v1/account_reports_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe 'Account Reports API', :type => :integration do
+describe 'Account Reports API', type: :request do
   before do
     @admin = account_admin_user
     user_with_pseudonym(:user => @admin)

spec/apis/v1/accounts_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Accounts API", :type => :integration do
+describe "Accounts API", type: :request do
   before do
     Pseudonym.any_instance.stubs(:works_for_account?).returns(true)
     user_with_pseudonym(:active_all => true)

spec/apis/v1/admins_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Admins API", :type => :integration do
+describe "Admins API", type: :request do
   before do
     @admin = account_admin_user
     user_with_pseudonym(:user => @admin)

spec/apis/v1/appointment_groups_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe AppointmentGroupsController, :type => :integration do
+describe AppointmentGroupsController, type: :request do
   before do
     course_with_teacher(:active_all => true, :user => user_with_pseudonym(:active_user => true))
     @course1 = @course

spec/apis/v1/assignment_groups_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe AssignmentGroupsController, :type => :integration do
+describe AssignmentGroupsController, type: :request do
   include Api
   include Api::V1::Assignment
 
@@ -295,7 +295,7 @@ describe AssignmentGroupsController, :type => :integration do
 end
 
 
-describe AssignmentGroupsApiController, :type => :integration do
+describe AssignmentGroupsApiController, type: :request do
   include Api
   include Api::V1::Assignment
 

spec/apis/v1/assignment_overrides_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe AssignmentOverridesController, :type => :integration do
+describe AssignmentOverridesController, type: :request do
   def validate_override_json(override, json)
     json['id'].should == override.id
     json['assignment_id'].should == override.assignment_id

spec/apis/v1/assignments_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../locked_spec')
 
-describe AssignmentsApiController, :type => :integration do
+describe AssignmentsApiController, type: :request do
   include Api
   include Api::V1::Assignment
   include Api::V1::Submission

spec/apis/v1/authentication_audit_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../../cassandra_spec_helper')
 
-describe "AuthenticationAudit API", type: :integration do
+describe "AuthenticationAudit API", type: :request do
   context "not configured" do
     before do
       Canvas::Cassandra::Database.stubs(:configured?).with('auditors').returns(false)

spec/apis/v1/calendar_events_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe CalendarEventsApiController, :type => :integration do
+describe CalendarEventsApiController, type: :request do
   before do
     course_with_teacher(:active_all => true, :user => user_with_pseudonym(:active_user => true))
     @me = @user

spec/apis/v1/collaborations_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe CollaborationsController, :type => :integration do
+describe CollaborationsController, type: :request do
   before do
     PluginSetting.new(:name => 'etherpad', :settings => {}).save!
     course_with_teacher(:active_all => true)

spec/apis/v1/collections_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Collections API", :type => :integration do
+describe "Collections API", type: :request do
   shared_examples_for "full access to collections" do
     it "should allow retrieving a paginated collection list" do
       json = api_call(:get, @collections_path, @collections_path_options)

spec/apis/v1/comm_messages_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe CommMessagesApiController, :type => :integration do
+describe CommMessagesApiController, type: :request do
   describe "index" do
     context "a site admin" do
       context "with permission" do

spec/apis/v1/communication_channels_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe 'CommunicationChannels API', :type => :integration do
+describe 'CommunicationChannels API', type: :request do
   describe 'index' do
     before do
       @someone = user_with_pseudonym

spec/apis/v1/conferences_api_spec.rb

@@ -22,7 +22,7 @@ include Api::V1::Conferences
 include Api::V1::Json
 include Api
 
-describe "Conferences API", :type => :integration do
+describe "Conferences API", type: :request do
   before do
     # these specs need an enabled web conference plugin
     @plugin = PluginSetting.find_or_create_by_name('wimba')

spec/apis/v1/content_exports_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe ContentExportsApiController, type: :integration do
+describe ContentExportsApiController, type: :request do
   let(:t_teacher) do
     user(active_all: true)
   end

spec/apis/v1/content_migrations_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe ContentMigrationsController, :type => :integration do
+describe ContentMigrationsController, type: :request do
   before do
     course_with_teacher_logged_in(:active_all => true, :user => user_with_pseudonym)
     @migration_url = "/api/v1/courses/#{@course.id}/content_migrations"

spec/apis/v1/context_module_items_api_spec.rb

@@ -17,7 +17,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Module Items API", :type => :integration do
+describe "Module Items API", type: :request do
   before do
     course.offer!
 

spec/apis/v1/context_modules_api_spec.rb

@@ -17,7 +17,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Modules API", :type => :integration do
+describe "Modules API", type: :request do
   before do
     course.offer!
 

spec/apis/v1/conversations_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../../sharding_spec_helper')
 
-describe ConversationsController, :type => :integration do
+describe ConversationsController, type: :request do
   before do
     @other = user(active_all: true)
 

spec/apis/v1/courses_api_spec.rb

@@ -127,7 +127,7 @@ describe Api::V1::Course do
   end
 end
 
-describe CoursesController, :type => :integration do
+describe CoursesController, type: :request do
   USER_API_FIELDS = %w(id name sortable_name short_name)
 
   before do
@@ -1868,7 +1868,7 @@ def each_copy_option
    [:modules, :context_modules], [:outcomes, :created_learning_outcomes]].each{|o| yield o}
 end
 
-describe ContentImportsController, :type => :integration do
+describe ContentImportsController, type: :request do
   before(:each) do
     course_with_teacher_logged_in(:active_all => true, :name => 'origin story')
     @copy_from = @course

spec/apis/v1/custom_gradebook_column_data_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe CustomGradebookColumnDataApiController, :type => :integration do
+describe CustomGradebookColumnDataApiController, type: :request do
   include Api
   include Api::V1::CustomGradebookColumn
 

spec/apis/v1/custom_gradebook_columns_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe CustomGradebookColumnsApiController, :type => :integration do
+describe CustomGradebookColumnsApiController, type: :request do
   include Api
   include Api::V1::CustomGradebookColumn
 

spec/apis/v1/developer_keys_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe DeveloperKeysController, :type => :integration do
+describe DeveloperKeysController, type: :request do
   describe "GET 'index'" do
     it 'should require authorization' do
       unauthorized_api_call(:get, "/api/v1/developer_keys.json",

spec/apis/v1/discussion_topics_api_spec.rb

@@ -72,7 +72,7 @@ describe Api::V1::DiscussionTopics do
   end
 end
 
-describe DiscussionTopicsController, :type => :integration do
+describe DiscussionTopicsController, type: :request do
   include Api::V1::User
 
   context 'locked api item' do

spec/apis/v1/enrollments_api_spec.rb

@@ -19,7 +19,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe EnrollmentsApiController, :type => :integration do
+describe EnrollmentsApiController, type: :request do
   describe "enrollment creation" do
     context "an admin user" do
       before do

spec/apis/v1/external_feeds_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe 'ExternalFeedsController', :type => :integration do
+describe 'ExternalFeedsController', type: :request do
   shared_examples_for "Announcement External Feeds" do
     before do
       @url_params = { :controller => "external_feeds", :action => "index", :format => "json" }

spec/apis/v1/external_tools_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe ExternalToolsController, :type => :integration do
+describe ExternalToolsController, type: :request do
   
   describe "in a course" do
     before(:each) do

spec/apis/v1/favorites_api_spec.rb

@@ -17,7 +17,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Favorites API", :type => :integration do
+describe "Favorites API", type: :request do
   before :each do
     @courses = []
     @courses << course_with_student(:active_all => true, :course_name => "Course 0").course

spec/apis/v1/feature_flags_api_spec.rb

@@ -17,7 +17,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Feature Flags API", :type => :integration do
+describe "Feature Flags API", type: :request do
   let(:t_site_admin) { Account.site_admin }
   let(:t_root_account) { account_model }
   let(:t_teacher) { user_with_pseudonym account: t_root_account }

spec/apis/v1/files_controller_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../locked_spec')
 
-describe "Files API", :type => :integration do
+describe "Files API", type: :request do
   context 'locked api item' do
     let(:item_type) { 'file' }
 

spec/apis/v1/folders_controller_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Folders API", :type => :integration do
+describe "Folders API", type: :request do
   before do
     course_with_teacher(:active_all => true, :user => user_with_pseudonym)
     @root = Folder.root_folders(@course).first

spec/apis/v1/grade_change_audit_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../../cassandra_spec_helper')
 
-describe "GradeChangeAudit API", type: :integration do
+describe "GradeChangeAudit API", type: :request do
   context "not configured" do
     before do
       Canvas::Cassandra::Database.stubs(:configured?).with('auditors').returns(false)

spec/apis/v1/gradebook_history_api_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe GradebookHistoryApiController, :type => :integration do
+describe GradebookHistoryApiController, type: :request do
   include Api
 
   describe 'GET /courses/:course_id/gradebook_history/days' do

spec/apis/v1/group_categories_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../file_uploads_spec_helper')
 
-describe "Group Categories API", :type => :integration do
+describe "Group Categories API", type: :request do
   def category_json(category)
     {
       'id' => category.id,

spec/apis/v1/groups_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../file_uploads_spec_helper')
 
-describe "Groups API", :type => :integration do
+describe "Groups API", type: :request do
   def group_json(group, user)
     {
       'id' => group.id,

spec/apis/v1/migrations_issues_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe MigrationIssuesController, :type => :integration do
+describe MigrationIssuesController, type: :request do
   before do
     course_with_teacher_logged_in(:active_all => true, :user => user_with_pseudonym)
     @migration = @course.content_migrations.create!

spec/apis/v1/notification_preferences_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe NotificationPreferencesController, :type => :integration do
+describe NotificationPreferencesController, type: :request do
   before do
     user_with_pseudonym
     Notification.delete_all

spec/apis/v1/outcome_groups_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Outcome Groups API", :type => :integration do
+describe "Outcome Groups API", type: :request do
   before :each do
     Pseudonym.any_instance.stubs(:works_for_account?).returns(true)
     user_with_pseudonym(:active_all => true)

spec/apis/v1/outcome_results_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Outcome Results API", :type => :integration do
+describe "Outcome Results API", type: :request do
 
   let(:outcome_course) do
     course(active_all: true) unless @course

spec/apis/v1/outcomes_api_spec.rb

@@ -19,7 +19,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Outcomes API", :type => :integration do
+describe "Outcomes API", type: :request do
   before :each do
     Pseudonym.any_instance.stubs(:works_for_account?).returns(true)
     user_with_pseudonym(:active_all => true)

spec/apis/v1/pages_api_spec.rb

@@ -18,7 +18,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../locked_spec')
 
-describe "Pages API", :type => :integration do
+describe "Pages API", type: :request do
   include Api::V1::User
   def avatar_url_for_user(user, *a)
     "http://www.example.com/images/messages/avatar-50.png"

spec/apis/v1/progress_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe ProgressController, :type => :integration do
+describe ProgressController, type: :request do
 
   describe "show" do
     before do

spec/apis/v1/pseudonyms_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe PseudonymsController, :type => :integration do
+describe PseudonymsController, type: :request do
   before do
     course_with_student(:active_all => true)
     account_admin_user

spec/apis/v1/quiz_groups_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../locked_spec')
 
-describe QuizGroupsController, :type => :integration do
+describe QuizGroupsController, type: :request do
 
   describe "POST /api/v1/courses/:course_id/quizzes/:quiz_id/groups (create)" do
 

spec/apis/v1/quiz_ip_filters_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe QuizIpFiltersController, :type => :integration do
+describe QuizIpFiltersController, type: :request do
   before :each do
     course_with_teacher_logged_in :active_all => true
 

spec/apis/v1/quiz_questions_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe QuizQuestionsController, :type => :integration do
+describe QuizQuestionsController, type: :request do
 
   context 'as a teacher' do
     before do

spec/apis/v1/quiz_reports_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../../models/quiz_statistics/item_analysis/common')
 
-describe QuizReportsController, :type => :integration do
+describe QuizReportsController, type: :request do
   describe "POST /courses/:course_id/quizzes/:quiz_id/reports" do
     before do
       teacher_in_course(:active_all => true)

spec/apis/v1/quiz_submission_files_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../file_uploads_spec_helper')
 
-describe QuizSubmissionFilesController, :type => :integration do
+describe QuizSubmissionFilesController, type: :request do
 
   context "quiz submissions file uploads" do
     before do

spec/apis/v1/quiz_submissions_api_spec.rb

@@ -65,7 +65,7 @@ shared_examples_for 'Quiz Submissions API Restricted Endpoints' do
   end
 end
 
-describe QuizSubmissionsApiController, :type => :integration do
+describe QuizSubmissionsApiController, type: :request do
   module Helpers
     def enroll_student(opts = {})
       last_user = @teacher = @user

spec/apis/v1/quizzes_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../locked_spec')
 
-describe QuizzesApiController, :type => :integration do
+describe QuizzesApiController, type: :request do
 
   context 'locked api item' do
     let(:item_type) { 'quiz' }

spec/apis/v1/roles_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Roles API", :type => :integration do
+describe "Roles API", type: :request do
   before do
     @account = Account.default
     account_admin_user(:account => @account)

spec/apis/v1/search_api_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe SearchController, :type => :integration do
+describe SearchController, type: :request do
   before do
     @account = Account.default
     course_with_teacher(:active_course => true, :active_enrollment => true, :user => user_with_pseudonym(:active_user => true))

spec/apis/v1/sections_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe SectionsController, :type => :integration do
+describe SectionsController, type: :request do
   describe '#index' do
     USER_API_FIELDS = %w(id name sortable_name short_name)
 

spec/apis/v1/services_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe "Services API", :type => :integration do
+describe "Services API", type: :request do
   before do
     user_with_pseudonym(:active_all => true)
     @kal = mock('Kaltura::ClientV3')

spec/apis/v1/sis_imports_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe SisImportsApiController, :type => :integration do
+describe SisImportsApiController, type: :request do
   before do
     @user = user_with_pseudonym :active_all => true
     user_session @user

spec/apis/v1/stream_items_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe UsersController, :type => :integration do
+describe UsersController, type: :request do
   include Api
   include Api::V1::Assignment
 

spec/apis/v1/submission_comments_api_spec.rb

@@ -20,7 +20,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../file_uploads_spec_helper')
 
-describe 'Submissions Comment API', :type => :integration do
+describe 'Submissions Comment API', type: :request do
 
   describe '#create_file' do
     before do

spec/apis/v1/submissions_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../file_uploads_spec_helper')
 
-describe 'Submissions API', :type => :integration do
+describe 'Submissions API', type: :request do
 
   def submit_homework(assignment, student, opts = {:body => "test!"})
     @submit_homework_time ||= Time.zone.at(0)

spec/apis/v1/tabs_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe TabsController, :type => :integration do
+describe TabsController, type: :request do
   describe 'index' do
     it "should require read permissions on the context" do
       course(:active_all => true)

spec/apis/v1/todo_items_api_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
 
-describe UsersController, :type => :integration do
+describe UsersController, type: :request do
   include Api
   include Api::V1::Assignment
   def update_assignment_json

spec/apis/v1/upcoming_events_api_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../api_spec_helper')
 
-describe UsersController, :type => :integration do
+describe UsersController, type: :request do
   include Api
 
 

spec/apis/v1/user_profiles_api_spec.rb

@@ -29,7 +29,7 @@ class TestUserApi
   end
 end
 
-describe "User Profile API", :type => :integration do
+describe "User Profile API", type: :request do
   before do
     @admin = account_admin_user
     course_with_student(:user => user_with_pseudonym(:name => 'Student', :username => 'pvuser@example.com'))

spec/apis/v1/users_api_spec.rb

@@ -204,7 +204,7 @@ describe Api::V1::User do
 
 end
 
-describe "Users API", :type => :integration do
+describe "Users API", type: :request do
   def avatar_url(id)
     "http://www.example.com/images/users/#{User.avatar_key(id)}?fallback=http%3A%2F%2Fwww.example.com%2Fimages%2Fmessages%2Favatar-50.png"
   end

spec/integration/collaborations_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe CollaborationsController, :type => :integration do
+describe CollaborationsController, type: :request do
 
   it 'should properly link to the user who posted the collaboration' do
     PluginSetting.create!(:name => 'etherpad', :settings => {})

spec/integration/conferences_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe ConferencesController, :type => :integration do
+describe ConferencesController, type: :request do
   before do
     WebConference.stubs(:plugins).returns([web_conference_plugin_mock("wimba", {:domain => "wimba.test"})])
   end

spec/integration/course_wizard_spec.rb

@@ -19,7 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../apis/api_spec_helper')
 
-describe CoursesController, :type => :integration do
+describe CoursesController, type: :request do
   it "should cache the course wizard based on the current user" do
     enable_cache do
       course_with_teacher(:active_enrollment => true, :name => 'unpublished course')

spec/integration/track_memory_and_cpu_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec/spec_helper')
 
-describe "memory and cpu tracking", :type => :integration do
+describe "memory and cpu tracking", type: :request do
 
   it "should pass cpu info to statsd" do
     account = Account.default

spec/spec_helper.rb

@@ -25,6 +25,20 @@ if CANVAS_RAILS2
   require 'spec'
   # require 'spec/autorun'
   require 'spec/rails'
+
+  # integration specs were renamed to request specs in rspec 2
+  def describe_with_rspec2_types(*args, &block)
+    unless args.last.is_a?(Hash)
+      args << {}
+    end
+    if args.last[:type] == :request
+      args.last[:type] = :integration
+    end
+    args.last[:location] ||= caller(0)[1]
+    describe_without_rspec2_types(*args, &block)
+  end
+  alias :describe_without_rspec2_types :describe
+  alias :describe :describe_with_rspec2_types
 else
   require 'rspec/rails'
 end

vendor/plugins/account_reports/spec_canvas/integrations/account_spec.rb

@@ -18,7 +18,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../../../spec/spec_helper')
 
-describe "Account Reports" , :type => :integration do
+describe "Account Reports" , type: :request do
 
   it "should see extra text when there is extra text" do
 

vendor/plugins/respondus_soap_endpoint/spec_canvas/integration/respondus_endpoint_spec.rb

@@ -20,7 +20,7 @@ class SpecStreamHandler < SOAP::StreamHandler
   end
 end
 
-describe "Respondus SOAP API", :type => :integration do
+describe "Respondus SOAP API", type: :request do
   # args is an array of [ arg_name, value ], not just raw values
   def soap_request(method, userName, password, context, *args)
     soap = SOAP::RPC::Driver.new('test', "urn:RespondusAPI")