Commit e4b2373b

@@ -1,11 +0,0 @@
-class PhotosController < ApplicationController
-  def index
-    @creation = Creation.find(params[:cake_id])
-    @photos = @creation.photos
-  end
-
-  def show
-    @creation = Creation.find(params[:cake_id])
-    @photo = @creation.photos.find(params[:id])
-  end
-end

@@ -1,27 +0,0 @@
-<div class="row-fluid">
-  <div class="span12">
-    <%= link_to "&laquo; Back to creation".html_safe, cake_path(@creation) %>
-    <div class="row-fluid">
-      <div class="span3">&nbsp;</div>
-      <div class="span6">
-        <div id="myCarousel" class="carousel slide">
-          <ol class="carousel-indicators">
-            <% @photos.each_with_index do |photo, index| %>
-              <li data-target="#myCarousel" data-slide-to="<%= index %>" class="<%= index == 0 ? "active" : "" %>"></li>
-            <% end %>
-          </ol>
-          <!-- Carousel items -->
-          <div class="carousel-inner">
-            <% @photos.each_with_index do |photo,index| %>
-              <div class="item <%= index == 0 ? "active" : "" %>"><%= image_tag photo.url_for(:large), :class => "thumbnail" %></div>
-            <% end %>
-          </div>
-          <!-- Carousel nav -->
-          <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
-          <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
-        </div>
-      </div>
-      <div class="span3">&nbsp;</div>
-    </div>
-  </div>
-</div>

@@ -1,22 +0,0 @@
-<div class="row-fluid">
-  <div class="span12">
-    <h1><%= link_to @creation.name, cake_path(@creation) %></h1>
-    <%= link_to cake_photo_path(@creation, @photo) do %>
-      <%= image_tag(@photo.url_for(:original), :class => "thumbnail") %>
-    <% end %>
-  </div>
-</div>
-
-<div class="row-fluid">
-  <div class="span12">
-    <ul class="thumbnails">
-      <% @creation.photos.each do |photo| %>
-        <li class="span2">
-          <%= link_to cake_photo_path(@creation, photo) do %>
-            <%= image_tag(photo.url_for(:thumb), class: "thumbnail") %>
-          <% end %>
-        </li>
-    <% end %>
-    </ul>
-  </div>
-</div>

@@ -16,7 +16,6 @@ Cake::Application.routes.draw do
   end
 
   resources :cakes, only: [:index, :show], path: :cakes do
-    resources :photos, only: [:index, :show]
     resources :favorites, only: [:create]
     get 'page/:page', action: :index, on: :collection, as: :paginate
     collection do

@@ -7,20 +7,6 @@ describe FavoritesController do
 
     before { http_login(user) }
 
-    context "when loading all the favorites for a cake" do
-      let(:favorite) { create(:favorite, creation: cake, user: user) }
-
-      before :each do
-        cake.favorites << favorite
-        cake.save!
-        get :index, cake_id: cake.id
-      end
-
-      it "should return them all" do
-        expect(assigns(:favorites)).to include(favorite)
-      end
-    end
-
     context "when adding a cake to your favorites" do
       before :each do
         post :create, cake_id: cake.id

@@ -1,36 +0,0 @@
-require 'rails_helper'
-
-describe PhotosController do
-  let(:cake){ create(:cake) }
-
-  describe "#index" do
-    before :each do
-      get :index, cake_id: cake.id
-    end
-
-    it "loads the cake" do
-      expect(assigns(:creation)).to eql(cake)
-    end
-
-    it "loads the photos" do
-      expect(assigns(:photos)).to match_array(cake.photos)
-    end
-  end
-
-  describe "#show" do
-    let(:photo) { create(:photo) }
-
-    before :each do
-      cake.photos.push(photo)
-      get :show, cake_id: cake.id, id: photo.id
-    end
-
-    it "loads the cake" do
-      expect(assigns(:creation)).to eql(cake)
-    end
-
-    it "loads the photo" do
-      expect(assigns(:photo)).to eql(photo)
-    end
-  end
-end

@@ -1,13 +1,7 @@
 require "rails_helper"
 
 describe FavoritesController do
-  describe "routing" do
-    it "routes to #index" do
-      expect(get: "/cakes/1/favorites").to route_to(controller: "favorites", action: "index", cake_id: "1")
-    end
-
-    it "routes to #create" do
-      expect(post: "/cakes/1/favorites").to route_to(controller: "favorites", action: "create", cake_id: "1")
-    end
+  it "routes to #create" do
+    expect(post: "/cakes/1/favorites").to route_to(controller: "favorites", action: "create", cake_id: "1")
   end
 end