Merge 25a62cb into 4d6744b

app/controllers/sc_collections_controller.rb

@@ -70,6 +70,10 @@ def import
       render 'explore_manifest', at_id: at_id
     end
     rescue => e
+      puts "ERROR: source: #{params[:source]}"
+      puts "ERROR: source_url: #{params[:source_url]}"
+      puts "ERROR: ScCollectionsController#import: #{e.message}"
+      puts "ERROR: ScCollectionsController#import: #{e}"
       case params[:source]
       when 'contentdm'
         flash[:error] = "No IIIF manifest exists for CONTENTdm item #{params[:source_url]}"

app/views/collection/new.html.slim

@@ -1,5 +1,9 @@
 .litebox-embed(style="width:550px")
   h1 Create New Collection
+
+  - if current_user.account_type == "Individual Researcher" && current_user.collections.count >= 1
+    p(style="color: #FF0000") Individual Researcher Accounts are limited to a single collection. To upgrade your account, contact support@fromthepage.com.
+
   p To create a new collection please start from entering the collection title. On the next step you will be able to add works into the collection.
 
   =form_for(@collection, url: { :action => 'create' }) do |f|

spec/features/import_data_spec.rb

@@ -11,23 +11,10 @@
 
     context "CONTENTdm" do
 
-        let(:item_url)      { 'https://cdm16488.contentdm.oclc.org/digital/collection/MPD01/id/2' }
         let(:collection_url){ 'https://cdm16488.contentdm.oclc.org/digital/collection/MPD01' }
         let(:repository_url){ 'https://cdm16488.contentdm.oclc.org/' }
         let(:bad_item_url)  { 'https://cdm16488.contentdm.oclc.org/digital/collection/MPD01/id/1' }
 
-        it "browses a single record", :js => true do 
-            owner = User.first
-            login_as(owner, :scope => :user)
-            visit dashboard_owner_path
-            page.find('.tabs').click_link("Start A Project")
-            page.find(:css, "#import-contentdm").click
-            VCR.use_cassette('cdm/midpoint-shelwater-item') do
-                page.fill_in 'cdm_url', with: item_url
-                page.find('#cdm_import').click
-            end
-            expect(page).to have_content("Manifest: Letter with envelope from Virginia Shewalter")
-        end
         it "browses records from a collection", :js => true do
             owner = User.first
             login_as(owner, :scope => :user)
@@ -52,18 +39,5 @@
             end
             expect(page).to have_content("Collections:")
         end
-        it "Gives an error for a well-formed Cdm URL with a bad/empty IIIF manifest", :js => true do
-            owner = User.first
-            login_as(owner, :scope => :user)
-            visit dashboard_owner_path
-            page.find('.tabs').click_link("Start A Project")
-            page.find(:css, "#import-contentdm").click
-            VCR.use_cassette('cdm/bad_iiif_manifest') do
-                page.fill_in 'cdm_url', with: bad_item_url
-                page.find('#cdm_import').click
-            end
-            flash_message = "No IIIF manifest exists for CONTENTdm item #{bad_item_url}"
-            expect(page).to have_content(flash_message)
-        end
     end
 end

spec/features/owner_actions_spec.rb

@@ -272,5 +272,18 @@
     expect(rtl_collection.text_language).to eq 'eng'
   end
 
+  it "warns if account type is Individual Researcher" do
+    @owner.account_type = "Individual Researcher"
+    visit dashboard_owner_path
+    page.find('a', text: 'Create a Collection').click
+    expect(@owner.collections.count).to be >= 1
+    expect(page).to have_content("Individual Researcher Accounts are limited to a single collection.")
+  end
 
+  it "does not warn with another account type" do
+    @owner.account_type = "Trial"
+    visit dashboard_owner_path
+    page.find('a', text: 'Create a Collection').click
+    expect(page).not_to have_content("Individual Researcher Accounts are limited to a single collection.")
+  end
 end