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

Conflicts:
	config/routes.rb

spec/requests/fetprofiles_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Fetprofiles" do
+  describe "GET /fetprofiles" 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 fetprofiles_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/fetzneditions_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Fetzneditions" do
+  describe "GET /fetzneditions" 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 fetzneditions_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/fotos_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Fotos" do
+  describe "GET /fotos" 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 fotos_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/galleries_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Galleries" do
+  describe "GET /galleries" 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 galleries_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/gremien_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Gremien" do
+  describe "GET /gremien" 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 gremien_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/memberships_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Memberships" do
+  describe "GET /memberships" 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 memberships_path
+      response.status.should be(200)
+    end
+  end
+end