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

Conflicts:
	config/routes.rb

spec/helpers/fetprofiles_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the FetprofilesHelper. For example:
+#
+# describe FetprofilesHelper 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 FetprofilesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/fetzneditions_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the FetzneditionsHelper. For example:
+#
+# describe FetzneditionsHelper 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 FetzneditionsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/fotos_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the FotosHelper. For example:
+#
+# describe FotosHelper 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 FotosHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/galleries_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the GalleriesHelper. For example:
+#
+# describe GalleriesHelper 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 GalleriesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/gremien_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the GremienHelper. For example:
+#
+# describe GremienHelper 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 GremienHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/memberships_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the MembershipsHelper. For example:
+#
+# describe MembershipsHelper 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 MembershipsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end