commands_spec.rb in cuukie-0.3.0

- old
+ new

@@ -11,41 +11,50 @@
   end
   
   it "expects a server on localhost:4569 by default" do
     begin
       start_process "ruby bin/cuukie --server >/dev/null 2>&1"
-      wait_for_server_on_port 4569
+      wait_for_server_at 4569
       cmd = "cd spec/test_project && \
              cucumber features/1_show_scenarios.feature:9 \
-                      --format cuukie >#{@out.path}"
+                      --require ../../lib/cuukie \
+                      --require features \
+                      --format Cuukie::Formatter \
+                      >#{@out.path}"
       system(cmd).should be_true
       @out.read.should == ''
     ensure
-      stop_server_on_port 4569
+      stop_server_at 4569
     end
   end
 
   it "can point to a different server" do
     start_process "ruby bin/cuukie --server --cuukieport 4570 >/dev/null 2>&1"
     begin
-      wait_for_server_on_port 4570
+      wait_for_server_at 4570
       cmd = "cd spec/test_project && \
              cucumber features/1_show_scenarios.feature:9 \
                       CUUKIE_SERVER=http://localhost:4570 \
-                      --format cuukie >#{@out.path}"
+                      --require ../../lib/cuukie \
+                      --require features \
+                      --format Cuukie::Formatter \
+                      >#{@out.path}"
       system(cmd).should be_true
       @out.read.should == ''
     ensure
-      stop_server_on_port 4570
+      stop_server_at 4570
     end
   end
   
   it "fails gracefully if the server is down" do
     cmd = "cd spec/test_project && \
            cucumber features/1_show_scenarios.feature:9 \
                     CUUKIE_SERVER=http://some.server:4570 \
-                    --format cuukie >#{@out.path}"
+                    --require ../../lib/cuukie \
+                    --require features \
+                    --format Cuukie::Formatter \
+                    >#{@out.path}"
     system(cmd).should be_true
     @out.read.should match 'I cannot find the cuukie server on http://some.server:4570'
   end
 end
 
@@ -65,11 +74,11 @@
                             --nowait \
                             --keepserver \
                             >/dev/null 2>&1"
 
     html.should match "Passing Scenario"
-    stop_server_on_port 4569
+    stop_server_at 4569
   end
   
   it "gives instructions to access the page if --showpage is not enabled" do
     system "ruby bin/cuukie spec/test_project/features/ \
                             --require spec/test_project/features/step_definitions/ \
@@ -87,30 +96,30 @@
                             --require lib/cuukie \
                             --nowait \
                             --cuukieport 4570 \
                             >/dev/null 2>&1"
     
-    lambda { ping_on_port 4570 }.should raise_error
+    lambda { ping_at 4570 }.should raise_error
   end
 
   describe "when used with the --server switch" do
-    it "starts the Cuukie server on port 4569 by default" do
+    it "starts the server on port 4569 by default" do
       start_process "ruby bin/cuukie --server >/dev/null 2>&1"
-      wait_for_server_on_port 4569
-      stop_server_on_port 4569
+      wait_for_server_at 4569
+      stop_server_at 4569
     end
 
-    it "starts the Cuukie server on any given port" do
+    it "starts the server on any given port" do
       start_process "ruby bin/cuukie --server --cuukieport 4570 >/dev/null 2>&1"
-      wait_for_server_on_port 4570
-      stop_server_on_port 4570
+      wait_for_server_at 4570
+      stop_server_at 4570
     end
 
     it "exits immediately after starting the server" do
       start_process "ruby bin/cuukie --server >/dev/null 2>&1"
-      wait_for_server_on_port 4569
+      wait_for_server_at 4569
       html.should match /Cuukie/
       html.should_not match /Feature:/
-      stop_server_on_port 4569
+      stop_server_at 4569
     end
   end
 end