tasks cleared

Rakefile

@@ -45,10 +45,10 @@ module FakeServer
     raise "Waited for the server but it did not finish"
   end
 
-  def self.start_server_and_invoke_test(task_name)
-    IO.popen("ruby ./spec/requests/fake_server.rb") do |pipe|
+  def self.start_sinatra
+    IO.popen("cd tests && ruby ./spec/requests/fake_server.rb") do |pipe|
       wait_server 4567
-      Rake::Task[task_name].invoke
+      yield
       Process.kill 'INT', pipe.pid
     end
   end
@@ -76,6 +76,14 @@ end
 namespace :test do
 
   task :spec do
+    FakeServer.start_sinatra do
+      FakeServer.start_server_and_run_spec "tests"
+    end
+  end
+
+  task :integration do
+    FakeServer.start_server_and_run_spec "full-examples/rest_from_scratch/part_1"
+    FakeServer.start_server_and_run_spec "full-examples/rest_from_scratch/part_2"
     FakeServer.start_server_and_run_spec "full-examples/rest_from_scratch/part_3"
   end
 

tests/Rakefile

@@ -5,35 +5,3 @@ require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
 Tests::Application.load_tasks
-
-module FakeServer
-  def self.wait_server(port=3000)
-    (1..15).each do 
-      begin
-        Net::HTTP.get(URI.parse("http://localhost:#{port}/"))
-        return
-      rescue
-        sleep 1
-      end
-    end
-    raise "Waited for the server but it did not finish"
-  end
-
-  def self.start_server_and_invoke_test(task_name)
-    IO.popen("ruby ./spec/requests/fake_server.rb") do |pipe|
-      wait_server(4567)
-      Rake::Task[task_name].invoke
-      Process.kill 'INT', pipe.pid
-    end
-  end
-
-end
-
-namespace :test do
-  task :spec do
-    FakeServer.start_server_and_invoke_test('spec')
-  end
-  task :server do
-    FakeServer.start_server_and_invoke_test('hell')
-  end
-end