spec/shared/controllers.rb in fat_free_crm-0.18.2 vs spec/shared/controllers.rb in fat_free_crm-0.19.0

@@ -20,13 +20,11 @@
   it "should save current autocomplete controller in a session" do
     get :auto_complete, params: { term: @query }
 
     # We don't save Admin/Users autocomplete controller in a session since Users are not
     # exposed through the Jumpbox.
-    unless controller.class.to_s.starts_with?("Admin::")
-      expect(session[:auto_complete]).to eq(@controller.controller_name.to_sym)
-    end
+    expect(session[:auto_complete]).to eq(@controller.controller_name.to_sym) unless controller.class.to_s.starts_with?("Admin::")
   end
 
   it "should render application/_auto_complete template" do
     post :auto_complete, params: { term: @query }
     expect(response).to render_template("application/_auto_complete")
@@ -37,15 +35,11 @@
   it "should attach existing asset to the parent asset of different type" do
     put :attach, params: { id: @model.id, assets: @attachment.class.name.tableize, asset_id: @attachment.id }, xhr: true
     expect(@model.send(@attachment.class.name.tableize)).to include(@attachment)
     expect(assigns[:attachment]).to eq(@attachment)
     expect(assigns[:attached]).to eq([@attachment])
-    if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
-      expect(assigns[:campaign]).to eq(@attachment.reload.campaign)
-    end
-    if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
-      expect(assigns[:account]).to eq(@attachment.reload.account)
-    end
+    expect(assigns[:campaign]).to eq(@attachment.reload.campaign) if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
+    expect(assigns[:account]).to eq(@attachment.reload.account) if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
     expect(response).to render_template("entities/attach")
   end
 
   it "should not attach the asset that is already attached" do
     if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))