Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

5 files changed, 54 insertions, 0 deletions

diff --git a/spec/controllers/imports_controller_spec.rb b/spec/controllers/imports_controller_spec.rb
new file mode 100644
index 000000000..e7a49a8e8
--- /dev/null
+++ b/spec/controllers/imports_controller_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe ImportsController do
+  login_user
+
+  describe "GET 'new'" do
+    it "returns http success" do
+      pending
+      get 'new'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      pending
+      get 'index'
+      response.should be_success
+    end
+  end
+
+end
diff --git a/spec/helpers/imports_helper_spec.rb b/spec/helpers/imports_helper_spec.rb
new file mode 100644
index 000000000..8e5ec0c86
--- /dev/null
+++ b/spec/helpers/imports_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the ImportsHelper. For example:
+#
+# describe ImportsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe ImportsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
new file mode 100644
index 000000000..734445b8b
--- /dev/null
+++ b/spec/models/import_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Import do
+  
+  
+
+end
diff --git a/spec/views/imports/index.html.erb_spec.rb b/spec/views/imports/index.html.erb_spec.rb
new file mode 100644
index 000000000..c0f2d3462
--- /dev/null
+++ b/spec/views/imports/index.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "imports/index.html.erb" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/imports/new.html.erb_spec.rb b/spec/views/imports/new.html.erb_spec.rb
new file mode 100644
index 000000000..a31539279
--- /dev/null
+++ b/spec/views/imports/new.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "imports/new.html.erb" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end