account-level tools couldn't be configured by url

previously this would only work for course-level tools

fixes #6935

test plan:
- try adding a tool to an account by url configuration
- make sure it doesn't die

Change-Id: Id04a0619bd733d351098731cf2db67f8a26936dd
Reviewed-on: https://gerrit.instructure.com/8136
Tested-by: Hudson <[email protected]>
Reviewed-by: Bracken Mosbacker <[email protected]>

app/models/context_external_tool.rb

@@ -430,7 +430,7 @@ def self.import_from_migration(hash, context, item=nil)
     end
 
     item.save!
-    context.imported_migration_items << item if context.imported_migration_items && item.new_record?
+    context.imported_migration_items << item if context.respond_to?(:imported_migration_items) && context.imported_migration_items && item.new_record?
     item
   end
 

spec/models/context_external_tool_spec.rb

@@ -364,4 +364,20 @@ def new_external_tool(context)
       (ContextExternalTool.find_for(tool.id, @course, :user_navigation) rescue nil).should be_nil
     end
   end
+
+  describe "import_from_migration" do
+    it "should work for course-level tools" do
+      course_model
+      tool = ContextExternalTool.import_from_migration({:title => 'tool', :url => 'http://example.com'}, @course)
+      tool.should_not be_nil
+      tool.context.should == @course
+    end
+
+    it "should work for account-level tools" do
+      course_model
+      tool = ContextExternalTool.import_from_migration({:title => 'tool', :url => 'http://example.com'}, @course.account)
+      tool.should_not be_nil
+      tool.context.should == @course.account
+    end
+  end
 end