Commit 5549ecd3

@@ -12,8 +12,6 @@ describe "changing my password" do
       end
       click_button("Sign In")
       visit settings_path
-      #click_link(user.name)
-      #click_link("Settings")
       click_link("Password")
       within(".form-horizontal") do
         fill_in('user_password', :with => "mopass")

@@ -2,16 +2,11 @@ require 'spec_helper'
 
 describe "Creations" do
   describe "GET /creations" do
-    before(:each) do
-      creation = FactoryGirl.create(:creation) do |c|
-        c.add_photo(File.new(File.join( Rails.root, 'spec/fixtures/images/example.png')))
-        c.user = FactoryGirl.create(:user)
-      end
-      creation.save!
+    before :each do
       visit creations_path
     end
-    
-    it "works! (now write some real specs)" do
+
+    it "should load the page properly" do
       page.should have_content("CakeSide")
     end
   end

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Logins" do
-  describe "GET /logins" do
+  describe "GET /login" do
     it "should be able to reach the login page" do
       visit user_session_path
       page.should have_content("Got an account? Login!")

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "uploading a new creation" do
+describe "uploading a new creation", :js => true do
   let!(:user) { create(:user, :password => "password") }
   let!(:category_1) { create(:category) }
   let!(:category_2) { create(:category) }