Skip to content

Commit

Permalink
Change all occurrances of FilesController to FileSetsController, fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
awead committed Dec 10, 2015
1 parent e1e41a5 commit 3ca79b5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Sufia::FilesController
module Sufia::FileSetsController
module BrowseEverything
include ActiveSupport::Concern

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Sufia
module FilesController::LocalIngestBehavior
module FileSetsController::LocalIngestBehavior
include ActiveSupport::Concern

def create
Expand Down Expand Up @@ -29,5 +29,5 @@ def perform_local_ingest(file_set_attributes, parent_id, upload_set_id)
render :new
end
end
end # /FilesController::LocalIngestBehavior
end # /FileSetsController::LocalIngestBehavior
end # /Sufia
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Sufia
module FilesController::UploadCompleteBehavior
module FileSetsController::UploadCompleteBehavior
def upload_complete_path(upload_set_id)
Rails.application.routes.url_helpers.edit_upload_set_path(upload_set_id)
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Sufia
module FilesController
module FileSetsController
extend ActiveSupport::Autoload
autoload :BrowseEverything
autoload :LocalIngestBehavior
Expand All @@ -11,9 +11,9 @@ module FileSetsControllerBehavior

included do
include Blacklight::Configurable
include Sufia::FilesController::BrowseEverything
include Sufia::FilesController::LocalIngestBehavior
extend Sufia::FilesController::UploadCompleteBehavior
include Sufia::FileSetsController::BrowseEverything
include Sufia::FileSetsController::LocalIngestBehavior
extend Sufia::FileSetsController::UploadCompleteBehavior

layout "sufia-one-column"

Expand Down
6 changes: 3 additions & 3 deletions spec/lib/sufia/upload_complete_behavior_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
require "spec_helper"
class UploadThing
extend Sufia::FilesController::UploadCompleteBehavior
extend Sufia::FileSetsController::UploadCompleteBehavior
end

class UploadThingRedefine
extend Sufia::FilesController::UploadCompleteBehavior
extend Sufia::FileSetsController::UploadCompleteBehavior
def self.upload_complete_path(_id)
"example.com"
end
Expand All @@ -14,7 +14,7 @@ def self.destroy_complete_path(_id)
end
end

describe Sufia::FilesController::UploadCompleteBehavior do
describe Sufia::FileSetsController::UploadCompleteBehavior do
let(:test_id) { "123abc" }
context "Not overridden" do
it "respond with the batch edit path" do
Expand Down

0 comments on commit 3ca79b5

Please sign in to comment.