Cleanup alternate_values_controller/helper and misc. minor edits.

app/helpers/alternate_values_helper.rb

@@ -1,29 +1,13 @@
 module AlternateValuesHelper
 
   def link_to_destroy_alternate_value(link_text, alternate_value)
-    # f.hidden_field(:_destroy) +
     link_to(link_text, '', class: 'alternate-value-destroy', alternate_value_id: alternate_value.id)
   end
 
   def link_to_edit_alternate_value(link_text, alternate_value)
     link_to(link_text, '', class: 'alternate-value-edit', alternate_value_id: alternate_value.id)
   end
 
-  def link_to_original_value(object: object)
-    link_to(object)
-  end
-
-  def link_to_add_alternate_value0(link_text, f, association)
-    new_object = f.object.class.reflect_on_association(association).klass.new
-    fields     = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
-      render("#{associtaion}/form", :f => builder)
-    end
-    # link_to(link_text, '', id: "#{association[0]}-add", onclick: "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")
-    # link_to(link_text, '', id: "#{association[0]}-add")
-    # link_to(link_text, '', id: "#{association[0]}-add", fields: fields)
-    link_to(link_text, '', class: "#{association}-add", content: "#{fields}")
-  end
-
   def link_to_add_alternate_value(link_text, f)
     new_object = f.object.class.reflect_on_association(:alternate_values).klass.new({alternate_object_type:      f.object.class.base_class.name,
                                                                                      alternate_object_id:        f.object.id,
@@ -48,7 +32,8 @@ def add_alternate_value_link(object: object, attribute: nil, user: user)
   end
 
   def edit_alternate_value_link(alternate_value)
-    link_to('Edit', edit_alternate_value_path(alternate_value))
+    edit_object_link(alternate_value)
+    # link_to('Edit', edit_alternate_value_path(alternate_value))
   end
 
   def destroy_alternate_value_link(alternate_value)

app/views/serials/show.html.erb

@@ -29,17 +29,7 @@
       <% end %>
     </ol>
 <% end %>
-<%= add_alternate_value_link(object: @serial, user: sessions_current_user) -%>
-
-<p>
-  <strong>Created by:</strong>
-  <%= @serial.created_by_id %>
-</p>
-
-<p>
-  <strong>Updated by:</strong>
-  <%= @serial.updated_by_id %>
-</p>
+<%#= add_alternate_value_link(object: @serial, user: sessions_current_user) -%>
 
 <p>
   <strong>Publisher:</strong>
@@ -66,6 +56,16 @@
   <%= @serial.last_year_of_issue %>
 </p>
 
+<!--<p>-->
+  <!--<strong>Created by:</strong>-->
+  <!--<%#= @serial.created_by_id %>-->
+<!--</p>-->
+
+<!--<p>-->
+  <!--<strong>Updated by:</strong>-->
+  <!--<%#= @serial.updated_by_id %>-->
+<!--</p>-->
+
 
 
 <%= link_to 'Edit', edit_serial_path(@serial) %> |

spec/features/serials_spec.rb

@@ -2,25 +2,24 @@
 
 describe 'Serials', :type => :feature do
 
-  it_behaves_like 'a_login_required_controller' do 
+  it_behaves_like 'a_login_required_controller' do
     let(:index_path) { serials_path }
     let(:page_index_name) { 'Serials' }
-  end 
+  end
 
-  describe 'GET /serials' do  # list all serials <serials#index>
-    before { 
-      sign_in_user_and_select_project 
+  describe 'GET /serials' do # list all serials <serials#index>
+    before {
+      sign_in_user_and_select_project
       visit serials_path }
     specify 'an index name is present' do
       expect(page).to have_content('Serials')
     end
   end
 
-  describe 'GET /serials/:id'  do # display a particular serial <serials#show>
+  describe 'GET /serials/:id' do # display a particular serial <serials#show>
     before {
       sign_in_user
-      $user_id = 1
-      @serial = FactoryGirl.create(:valid_serial) #create auto saves
+      @serial  = factory_girl_create_for_user(:valid_serial, @user)
       visit serial_path(@serial)
     }
     specify 'should see serial attributes' do

spec/helpers/collecting_event_spec.rb

@@ -26,7 +26,7 @@
       expect(collecting_event_link(collecting_event)).to have_link("Locality #{collecting_event.id} for testing...")
     end
 
-    specify "#collecting_event_search_form" do
+    specify '#collecting_event_search_form' do
       expect(collecting_events_search_form).to have_button('Show')
       expect(collecting_events_search_form).to have_field('collecting_event_id_for_quick_search_form')
     end

spec/routing/alternate_values_routing_spec.rb

@@ -1,18 +1,18 @@
-require "rails_helper"
+require 'rails_helper'
 
 describe AlternateValuesController, :type => :routing do
-  describe "routing" do
+  describe 'routing' do
 
-    it "routes to #create" do
-      expect(post("/alternate_values")).to route_to("alternate_values#create")
+    it 'routes to #create' do
+      expect(post('/alternate_values')).to route_to('alternate_values#create')
     end
 
-    it "routes to #update" do
-      expect(put("/alternate_values/1")).to route_to("alternate_values#update", :id => "1")
+    it 'routes to #update' do
+      expect(put('/alternate_values/1')).to route_to('alternate_values#update', :id => '1')
     end
 
-    it "routes to #destroy" do
-      expect(delete("/alternate_values/1")).to route_to("alternate_values#destroy", :id => "1")
+    it 'routes to #destroy' do
+      expect(delete('/alternate_values/1')).to route_to('alternate_values#destroy', :id => '1')
     end
 
   end

spec/routing/geographic_area_types_routing_spec.rb

@@ -1,34 +1,34 @@
-require "rails_helper"
+require 'rails_helper'
 
 describe GeographicAreaTypesController, :type => :routing do
-  describe "routing" do
+  describe 'routing' do
 
-    it "routes to #index" do
-      expect(get("/geographic_area_types")).to route_to("geographic_area_types#index")
+    it 'routes to #index' do
+      expect(get('/geographic_area_types')).to route_to('geographic_area_types#index')
     end
 
-    it "routes to #new" do
-      expect(get("/geographic_area_types/new")).to route_to("geographic_area_types#new")
+    it 'routes to #new' do
+      expect(get('/geographic_area_types/new')).to route_to('geographic_area_types#new')
     end
 
-    it "routes to #show" do
-      expect(get("/geographic_area_types/1")).to route_to("geographic_area_types#show", :id => "1")
+    it 'routes to #show' do
+      expect(get('/geographic_area_types/1')).to route_to('geographic_area_types#show', :id => '1')
     end
 
-    it "routes to #edit" do
-      expect(get("/geographic_area_types/1/edit")).to route_to("geographic_area_types#edit", :id => "1")
+    it 'routes to #edit' do
+      expect(get('/geographic_area_types/1/edit')).to route_to('geographic_area_types#edit', :id => '1')
     end
 
-    it "routes to #create" do
-      expect(post("/geographic_area_types")).to route_to("geographic_area_types#create")
+    it 'routes to #create' do
+      expect(post('/geographic_area_types')).to route_to('geographic_area_types#create')
     end
 
-    it "routes to #update" do
-      expect(put("/geographic_area_types/1")).to route_to("geographic_area_types#update", :id => "1")
+    it 'routes to #update' do
+      expect(put('/geographic_area_types/1')).to route_to('geographic_area_types#update', :id => '1')
     end
 
-    it "routes to #destroy" do
-      expect(delete("/geographic_area_types/1")).to route_to("geographic_area_types#destroy", :id => "1")
+    it 'routes to #destroy' do
+      expect(delete('/geographic_area_types/1')).to route_to('geographic_area_types#destroy', :id => '1')
     end
 
   end

spec/routing/geographic_areas_geographic_items_routing_spec.rb

@@ -1,34 +1,34 @@
-require "rails_helper"
+require 'rails_helper'
 
 describe GeographicAreasGeographicItemsController, :type => :routing do
-  describe "routing" do
+  describe 'routing' do
 
-    it "routes to #index" do
-      expect(get("/geographic_areas_geographic_items")).to route_to("geographic_areas_geographic_items#index")
+    it 'routes to #index' do
+      expect(get('/geographic_areas_geographic_items')).to route_to('geographic_areas_geographic_items#index')
     end
 
-    it "routes to #new" do
-      expect(get("/geographic_areas_geographic_items/new")).to route_to("geographic_areas_geographic_items#new")
+    it 'routes to #new' do
+      expect(get('/geographic_areas_geographic_items/new')).to route_to('geographic_areas_geographic_items#new')
     end
 
-    it "routes to #show" do
-      expect(get("/geographic_areas_geographic_items/1")).to route_to("geographic_areas_geographic_items#show", :id => "1")
+    it 'routes to #show' do
+      expect(get('/geographic_areas_geographic_items/1')).to route_to('geographic_areas_geographic_items#show', :id => '1')
     end
 
-    it "routes to #edit" do
-      expect(get("/geographic_areas_geographic_items/1/edit")).to route_to("geographic_areas_geographic_items#edit", :id => "1")
+    it 'routes to #edit' do
+      expect(get('/geographic_areas_geographic_items/1/edit')).to route_to('geographic_areas_geographic_items#edit', :id => '1')
     end
 
-    it "routes to #create" do
-      expect(post("/geographic_areas_geographic_items")).to route_to("geographic_areas_geographic_items#create")
+    it 'routes to #create' do
+      expect(post('/geographic_areas_geographic_items')).to route_to('geographic_areas_geographic_items#create')
     end
 
-    it "routes to #update" do
-      expect(put("/geographic_areas_geographic_items/1")).to route_to("geographic_areas_geographic_items#update", :id => "1")
+    it 'routes to #update' do
+      expect(put('/geographic_areas_geographic_items/1')).to route_to('geographic_areas_geographic_items#update', :id => '1')
     end
 
-    it "routes to #destroy" do
-      expect(delete("/geographic_areas_geographic_items/1")).to route_to("geographic_areas_geographic_items#destroy", :id => "1")
+    it 'routes to #destroy' do
+      expect(delete('/geographic_areas_geographic_items/1')).to route_to('geographic_areas_geographic_items#destroy', :id => '1')
     end
 
   end

spec/routing/geographic_areas_routing_spec.rb

@@ -1,34 +1,34 @@
-require "rails_helper"
+require 'rails_helper'
 
 describe GeographicAreasController, :type => :routing do
-  describe "routing" do
+  describe 'routing' do
 
-    it "routes to #index" do
-      expect(get("/geographic_areas")).to route_to("geographic_areas#index")
+    it 'routes to #index' do
+      expect(get('/geographic_areas')).to route_to('geographic_areas#index')
     end
 
-    it "routes to #new" do
-      expect(get("/geographic_areas/new")).to route_to("geographic_areas#new")
+    it 'routes to #new' do
+      expect(get('/geographic_areas/new')).to route_to('geographic_areas#new')
     end
 
-    it "routes to #show" do
-      expect(get("/geographic_areas/1")).to route_to("geographic_areas#show", :id => "1")
+    it 'routes to #show' do
+      expect(get('/geographic_areas/1')).to route_to('geographic_areas#show', :id => '1')
     end
 
-    it "routes to #edit" do
-      expect(get("/geographic_areas/1/edit")).to route_to("geographic_areas#edit", :id => "1")
+    it 'routes to #edit' do
+      expect(get('/geographic_areas/1/edit')).to route_to('geographic_areas#edit', :id => '1')
     end
 
-    it "routes to #create" do
-      expect(post("/geographic_areas")).to route_to("geographic_areas#create")
+    it 'routes to #create' do
+      expect(post('/geographic_areas')).to route_to('geographic_areas#create')
     end
 
-    it "routes to #update" do
-      expect(put("/geographic_areas/1")).to route_to("geographic_areas#update", :id => "1")
+    it 'routes to #update' do
+      expect(put('/geographic_areas/1')).to route_to('geographic_areas#update', :id => '1')
     end
 
-    it "routes to #destroy" do
-      expect(delete("/geographic_areas/1")).to route_to("geographic_areas#destroy", :id => "1")
+    it 'routes to #destroy' do
+      expect(delete('/geographic_areas/1')).to route_to('geographic_areas#destroy', :id => '1')
     end
 
   end

spec/routing/geographic_items_routing_spec.rb

@@ -1,34 +1,34 @@
-require "rails_helper"
+require 'rails_helper'
 
 describe GeographicItemsController, :type => :routing do
-  describe "routing" do
+  describe 'routing' do
 
-    it "routes to #index" do
-      expect(get("/geographic_items")).to route_to("geographic_items#index")
+    it 'routes to #index' do
+      expect(get('/geographic_items')).to route_to('geographic_items#index')
     end
 
-    it "routes to #new" do
-      expect(get("/geographic_items/new")).to route_to("geographic_items#new")
+    it 'routes to #new' do
+      expect(get('/geographic_items/new')).to route_to('geographic_items#new')
     end
 
-    it "routes to #show" do
-      expect(get("/geographic_items/1")).to route_to("geographic_items#show", :id => "1")
+    it 'routes to #show' do
+      expect(get('/geographic_items/1')).to route_to('geographic_items#show', :id => '1')
     end
 
-    it "routes to #edit" do
-      expect(get("/geographic_items/1/edit")).to route_to("geographic_items#edit", :id => "1")
+    it 'routes to #edit' do
+      expect(get('/geographic_items/1/edit')).to route_to('geographic_items#edit', :id => '1')
     end
 
-    it "routes to #create" do
-      expect(post("/geographic_items")).to route_to("geographic_items#create")
+    it 'routes to #create' do
+      expect(post('/geographic_items')).to route_to('geographic_items#create')
     end
 
-    it "routes to #update" do
-      expect(put("/geographic_items/1")).to route_to("geographic_items#update", :id => "1")
+    it 'routes to #update' do
+      expect(put('/geographic_items/1')).to route_to('geographic_items#update', :id => '1')
     end
 
-    it "routes to #destroy" do
-      expect(delete("/geographic_items/1")).to route_to("geographic_items#destroy", :id => "1")
+    it 'routes to #destroy' do
+      expect(delete('/geographic_items/1')).to route_to('geographic_items#destroy', :id => '1')
     end
 
   end