Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb

spec/controllers/calendars_controller_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe CalendarsController do
+
+  # This should return the minimal set of attributes required to create a valid
+  # Calendar. As you add validations to Calendar, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) { { "name" => "MyString" } }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # CalendarsController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET index" do
+    it "assigns all calendars as @calendars" do
+      calendar = Calendar.create! valid_attributes
+      get :index, {}, valid_session
+      assigns(:calendars).should eq([calendar])
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested calendar as @calendar" do
+      calendar = Calendar.create! valid_attributes
+      get :show, {:id => calendar.to_param}, valid_session
+      assigns(:calendar).should eq(calendar)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new calendar as @calendar" do
+      get :new, {}, valid_session
+      assigns(:calendar).should be_a_new(Calendar)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested calendar as @calendar" do
+      calendar = Calendar.create! valid_attributes
+      get :edit, {:id => calendar.to_param}, valid_session
+      assigns(:calendar).should eq(calendar)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new Calendar" do
+        expect {
+          post :create, {:calendar => valid_attributes}, valid_session
+        }.to change(Calendar, :count).by(1)
+      end
+
+      it "assigns a newly created calendar as @calendar" do
+        post :create, {:calendar => valid_attributes}, valid_session
+        assigns(:calendar).should be_a(Calendar)
+        assigns(:calendar).should be_persisted
+      end
+
+      it "redirects to the created calendar" do
+        post :create, {:calendar => valid_attributes}, valid_session
+        response.should redirect_to(Calendar.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved calendar as @calendar" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        post :create, {:calendar => { "name" => "invalid value" }}, valid_session
+        assigns(:calendar).should be_a_new(Calendar)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        post :create, {:calendar => { "name" => "invalid value" }}, valid_session
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested calendar" do
+        calendar = Calendar.create! valid_attributes
+        # Assuming there are no other calendars in the database, this
+        # specifies that the Calendar created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        Calendar.any_instance.should_receive(:update_attributes).with({ "name" => "MyString" })
+        put :update, {:id => calendar.to_param, :calendar => { "name" => "MyString" }}, valid_session
+      end
+
+      it "assigns the requested calendar as @calendar" do
+        calendar = Calendar.create! valid_attributes
+        put :update, {:id => calendar.to_param, :calendar => valid_attributes}, valid_session
+        assigns(:calendar).should eq(calendar)
+      end
+
+      it "redirects to the calendar" do
+        calendar = Calendar.create! valid_attributes
+        put :update, {:id => calendar.to_param, :calendar => valid_attributes}, valid_session
+        response.should redirect_to(calendar)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the calendar as @calendar" do
+        calendar = Calendar.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calendar.to_param, :calendar => { "name" => "invalid value" }}, valid_session
+        assigns(:calendar).should eq(calendar)
+      end
+
+      it "re-renders the 'edit' template" do
+        calendar = Calendar.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calendar.to_param, :calendar => { "name" => "invalid value" }}, valid_session
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested calendar" do
+      calendar = Calendar.create! valid_attributes
+      expect {
+        delete :destroy, {:id => calendar.to_param}, valid_session
+      }.to change(Calendar, :count).by(-1)
+    end
+
+    it "redirects to the calendars list" do
+      calendar = Calendar.create! valid_attributes
+      delete :destroy, {:id => calendar.to_param}, valid_session
+      response.should redirect_to(calendars_url)
+    end
+  end
+
+end

spec/controllers/calentries_controller_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe CalentriesController do
+
+  # This should return the minimal set of attributes required to create a valid
+  # Calentry. As you add validations to Calentry, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) { { "start" => "2013-08-05 21:17:10" } }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # CalentriesController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET index" do
+    it "assigns all calentries as @calentries" do
+      calentry = Calentry.create! valid_attributes
+      get :index, {}, valid_session
+      assigns(:calentries).should eq([calentry])
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested calentry as @calentry" do
+      calentry = Calentry.create! valid_attributes
+      get :show, {:id => calentry.to_param}, valid_session
+      assigns(:calentry).should eq(calentry)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new calentry as @calentry" do
+      get :new, {}, valid_session
+      assigns(:calentry).should be_a_new(Calentry)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested calentry as @calentry" do
+      calentry = Calentry.create! valid_attributes
+      get :edit, {:id => calentry.to_param}, valid_session
+      assigns(:calentry).should eq(calentry)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new Calentry" do
+        expect {
+          post :create, {:calentry => valid_attributes}, valid_session
+        }.to change(Calentry, :count).by(1)
+      end
+
+      it "assigns a newly created calentry as @calentry" do
+        post :create, {:calentry => valid_attributes}, valid_session
+        assigns(:calentry).should be_a(Calentry)
+        assigns(:calentry).should be_persisted
+      end
+
+      it "redirects to the created calentry" do
+        post :create, {:calentry => valid_attributes}, valid_session
+        response.should redirect_to(Calentry.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved calentry as @calentry" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        post :create, {:calentry => { "start" => "invalid value" }}, valid_session
+        assigns(:calentry).should be_a_new(Calentry)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        post :create, {:calentry => { "start" => "invalid value" }}, valid_session
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested calentry" do
+        calentry = Calentry.create! valid_attributes
+        # Assuming there are no other calentries in the database, this
+        # specifies that the Calentry created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        Calentry.any_instance.should_receive(:update_attributes).with({ "start" => "2013-08-05 21:17:10" })
+        put :update, {:id => calentry.to_param, :calentry => { "start" => "2013-08-05 21:17:10" }}, valid_session
+      end
+
+      it "assigns the requested calentry as @calentry" do
+        calentry = Calentry.create! valid_attributes
+        put :update, {:id => calentry.to_param, :calentry => valid_attributes}, valid_session
+        assigns(:calentry).should eq(calentry)
+      end
+
+      it "redirects to the calentry" do
+        calentry = Calentry.create! valid_attributes
+        put :update, {:id => calentry.to_param, :calentry => valid_attributes}, valid_session
+        response.should redirect_to(calentry)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the calentry as @calentry" do
+        calentry = Calentry.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calentry.to_param, :calentry => { "start" => "invalid value" }}, valid_session
+        assigns(:calentry).should eq(calentry)
+      end
+
+      it "re-renders the 'edit' template" do
+        calentry = Calentry.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calentry.to_param, :calentry => { "start" => "invalid value" }}, valid_session
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested calentry" do
+      calentry = Calentry.create! valid_attributes
+      expect {
+        delete :destroy, {:id => calentry.to_param}, valid_session
+      }.to change(Calentry, :count).by(-1)
+    end
+
+    it "redirects to the calentries list" do
+      calentry = Calentry.create! valid_attributes
+      delete :destroy, {:id => calentry.to_param}, valid_session
+      response.should redirect_to(calentries_url)
+    end
+  end
+
+end

spec/factories/calendars.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :calendar do
+    name "MyString"
+    public false
+  end
+end

spec/factories/calentries.rb

@@ -0,0 +1,10 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :calentry do
+    start "2013-08-05 21:17:10"
+    ende "2013-08-05 21:17:10"
+    summary "MyString"
+    typ 1
+  end
+end

spec/helpers/calendars_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CalendarsHelper. For example:
+#
+# describe CalendarsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe CalendarsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/calentries_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CalentriesHelper. For example:
+#
+# describe CalentriesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe CalentriesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/calendar_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Calendar do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/calentry_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Calentry do
+ it "should be valid with full data" do
+   e = FactoryGirl.build(:calentry)
+   c = FactoryGirl.create(:calendar)
+   e.calendars<<c
+   e.should be_valid
+ end
+ [:ende,:start,:typ].each do |attr|
+ it "should not be valid without #{attr}" do 
+  e= FactoryGirl.build(:calentry, attr => nil)
+  c=FactoryGirl.create(:calendar)
+    e.calendars<<c
+   e.should_not be_valid 
+   e.should have_at_least(1).errors_on(attr)
+ end
+ end
+ 
+end

spec/requests/calendars_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Calendars" do
+  describe "GET /calendars" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get calendars_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/calentries_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Calentries" do
+  describe "GET /calentries" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get calentries_path
+      response.status.should be(200)
+    end
+  end
+end

spec/routing/calendars_routing_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe CalendarsController do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/calendars").should route_to("calendars#index")
+    end
+
+    it "routes to #new" do
+      get("/calendars/new").should route_to("calendars#new")
+    end
+
+    it "routes to #show" do
+      get("/calendars/1").should route_to("calendars#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/calendars/1/edit").should route_to("calendars#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/calendars").should route_to("calendars#create")
+    end
+
+    it "routes to #update" do
+      put("/calendars/1").should route_to("calendars#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/calendars/1").should route_to("calendars#destroy", :id => "1")
+    end
+
+  end
+end

spec/routing/calentries_routing_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe CalentriesController do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/calentries").should route_to("calentries#index")
+    end
+
+    it "routes to #new" do
+      get("/calentries/new").should route_to("calentries#new")
+    end
+
+    it "routes to #show" do
+      get("/calentries/1").should route_to("calentries#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/calentries/1/edit").should route_to("calentries#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/calentries").should route_to("calentries#create")
+    end
+
+    it "routes to #update" do
+      put("/calentries/1").should route_to("calentries#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/calentries/1").should route_to("calentries#destroy", :id => "1")
+    end
+
+  end
+end

spec/views/calendars/edit.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calendars/edit" do
+  before(:each) do
+    @calendar = assign(:calendar, stub_model(Calendar,
+      :name => "MyString",
+      :public => false
+    ))
+  end
+
+  it "renders the edit calendar form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calendar_path(@calendar), "post" do
+      assert_select "input#calendar_name[name=?]", "calendar[name]"
+      assert_select "input#calendar_public[name=?]", "calendar[public]"
+    end
+  end
+end

spec/views/calendars/index.html.erb_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "calendars/index" do
+  before(:each) do
+    assign(:calendars, [
+      stub_model(Calendar,
+        :name => "Name",
+        :public => false
+      ),
+      stub_model(Calendar,
+        :name => "Name",
+        :public => false
+      )
+    ])
+  end
+
+  it "renders a list of calendars" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr>td", :text => "Name".to_s, :count => 2
+    assert_select "tr>td", :text => false.to_s, :count => 2
+  end
+end

spec/views/calendars/new.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calendars/new" do
+  before(:each) do
+    assign(:calendar, stub_model(Calendar,
+      :name => "MyString",
+      :public => false
+    ).as_new_record)
+  end
+
+  it "renders new calendar form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calendars_path, "post" do
+      assert_select "input#calendar_name[name=?]", "calendar[name]"
+      assert_select "input#calendar_public[name=?]", "calendar[public]"
+    end
+  end
+end

spec/views/calendars/show.html.erb_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "calendars/show" do
+  before(:each) do
+    @calendar = assign(:calendar, stub_model(Calendar,
+      :name => "Name",
+      :public => false
+    ))
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/Name/)
+    rendered.should match(/false/)
+  end
+end

spec/views/calentries/edit.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calentries/edit" do
+  before(:each) do
+    @calentry = assign(:calentry, stub_model(Calentry,
+      :summary => "MyString",
+      :typ => 1
+    ))
+  end
+
+  it "renders the edit calentry form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calentry_path(@calentry), "post" do
+      assert_select "input#calentry_summary[name=?]", "calentry[summary]"
+      assert_select "input#calentry_typ[name=?]", "calentry[typ]"
+    end
+  end
+end

spec/views/calentries/index.html.erb_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "calentries/index" do
+  before(:each) do
+    assign(:calentries, [
+      stub_model(Calentry,
+        :summary => "Summary",
+        :typ => 1
+      ),
+      stub_model(Calentry,
+        :summary => "Summary",
+        :typ => 1
+      )
+    ])
+  end
+
+  it "renders a list of calentries" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr>td", :text => "Summary".to_s, :count => 2
+    assert_select "tr>td", :text => 1.to_s, :count => 2
+  end
+end

spec/views/calentries/new.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calentries/new" do
+  before(:each) do
+    assign(:calentry, stub_model(Calentry,
+      :summary => "MyString",
+      :typ => 1
+    ).as_new_record)
+  end
+
+  it "renders new calentry form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calentries_path, "post" do
+      assert_select "input#calentry_summary[name=?]", "calentry[summary]"
+      assert_select "input#calentry_typ[name=?]", "calentry[typ]"
+    end
+  end
+end

spec/views/calentries/show.html.erb_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "calentries/show" do
+  before(:each) do
+    @calentry = assign(:calentry, stub_model(Calentry,
+      :summary => "Summary",
+      :typ => 1
+    ))
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/Summary/)
+    rendered.should match(/1/)
+  end
+end