Merge pull request #529 from pulibrary/boxless-with-vocabs

Fixing controlled vocabularies for boxless folders

app/controllers/ephemera_folders_controller.rb

@@ -63,17 +63,8 @@ def parent_resource
     find_resource(params[:parent_id])
   end
 
-  # TODO: this could return a project in a boxless setup?
-  def ephemera_box
-    @ephemera_box ||= params[:parent_id] ? parent_resource.decorate : resource.decorate.ephemera_box
-  rescue => e
-    Rails.logger.warn e
-    nil
-  end
-
-  # TODO: seems like this could fail in a boxless folder / project setup
   def fields
-    @fields ||= ephemera_box.ephemera_project.fields
+    @fields ||= ephemera_project.fields
   rescue => e
     Rails.logger.warn e
     []
@@ -100,6 +91,6 @@ def top_languages
 
   # returns decorated project
   def ephemera_project
-    ephemera_box ? ephemera_box.ephemera_project : parent_resource.decorate
+    parent_resource.is_a?(EphemeraProject) ? parent_resource.decorate : parent_resource.decorate.ephemera_project
   end
 end

spec/features/ephemera_vocabularies_spec.rb

@@ -64,6 +64,30 @@
         expect(page.all(:css, '.dropdown-menu.open').first.all(:css, 'a:last-child').last).to have_content 'test term'
       end
     end
+
+    context 'when users have added a field and boxless' do
+      let(:ephemera_field) do
+        res = FactoryGirl.create_for_repository(:ephemera_field, member_of_vocabulary_id: ephemera_vocabulary.id)
+        adapter.persister.save(resource: res)
+      end
+
+      before do
+        res = FactoryGirl.create_for_repository(:ephemera_term)
+        res.member_of_vocabulary_id = ephemera_vocabulary.id
+        adapter.persister.save(resource: res)
+
+        ephemera_project.member_ids = [ephemera_field.id]
+        adapter.persister.save(resource: ephemera_project)
+      end
+
+      scenario 'users can add folder metadata using controlled vocabularies' do
+        visit parent_new_ephemera_box_path(parent_id: ephemera_project.id)
+
+        expect(page).to have_selector('.ephemera_folder_language button.dropdown-toggle')
+        page.find(:css, '[data-id="ephemera_folder_language"]').click
+        expect(page.all(:css, '.dropdown-menu.open').first.all(:css, 'a:last-child').last).to have_content 'test term'
+      end
+    end
   end
 
   scenario 'users can create controlled vocabularies' do