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

Conflicts:
	Gemfile.lock
	config/routes.rb

spec/routing/fetmeetings_routing_spec.rb

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

spec/routing/fetmeetingtops_routing_spec.rb

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