spec/requests/main_spec.rb in merb-admin-0.4.7 vs spec/requests/main_spec.rb in merb-admin-0.4.8

@@ -68,11 +68,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"Site administration\"" do
+    it "should show \"Site administration\"" do
       @response.body.should contain("Site administration")
     end
   end
 
   describe "list" do
@@ -82,11 +82,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"Select model to edit\"" do
+    it "should show \"Select model to edit\"" do
       @response.body.should contain("Select player to edit")
     end
   end
 
   describe "list with sort" do
@@ -130,11 +130,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
       @response.body.should contain("Jackie Robinson")
     end
 
     it "should not contain an incorrect result" do
       @response.body.should_not contain("Sandy Koufax")
@@ -152,11 +152,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
       @response.body.should contain("Sandy Koufax")
     end
 
     it "should not contain an incorrect result" do
       @response.body.should_not contain("Jackie Robinson")
@@ -175,11 +175,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
       @response.body.should contain("Moises Alou")
     end
 
     it "should not contain an incorrect result" do
       @response.body.should_not contain("David Wright")
@@ -197,11 +197,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain a correct result" do
+    it "should show a correct result" do
     end
 
     it "should not contain an incorrect result" do
       @response.body.should_not contain("Jackie Robinson")
       @response.body.should_not contain("Moises Alou")
@@ -218,11 +218,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"2 results\"" do
+    it "should show \"2 results\"" do
       @response.body.should contain("2 players")
     end
   end
 
   describe "list with 20 objects", :given => "twenty players exist" do
@@ -234,11 +234,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"20 results\"" do
+    it "should show \"20 results\"" do
       @response.body.should contain("20 players")
     end
   end
 
   describe "list with 20 objects, page 8", :given => "twenty players exist" do
@@ -292,11 +292,11 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"New model\"" do
+    it "should show \"New model\"" do
       @response.body.should contain("New player")
     end
   end
 
   describe "new with has-one association", :given => "a draft exists" do
@@ -326,13 +326,28 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"Edit model\"" do
+    it "should show \"Edit model\"" do
       @response.body.should contain("Edit player")
     end
+
+    it "should show required fields as \"Required\"" do
+      @response.body.should contain(/Name\n\s*Required/)
+      @response.body.should contain(/Number\n\s*Required/)
+      @response.body.should contain(/Team\n\s*Required/)
+    end
+
+    it "should show non-required fields as \"Optional\"" do
+      @response.body.should contain(/Position\n\s*Optional/)
+      @response.body.should contain(/Batting average\n\s*Optional/)
+      @response.body.should contain(/Born on\n\s*Optional/)
+      @response.body.should contain(/Wake at\n\s*Optional/)
+      @response.body.should contain(/Notes\n\s*Optional/)
+      @response.body.should contain(/Draft\n\s*Optional/)
+    end
   end
 
   describe "edit with has-one association", :given => "a player exists and a draft exists" do
     before(:each) do
       @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
@@ -442,11 +457,11 @@
   describe "create with invalid object" do
     before(:each) do
       @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
     end
 
-    it "should contain an error message" do
+    it "should show an error message" do
       @response.body.should contain("Player failed to be created")
     end
   end
 
   describe "update", :given => "a player exists" do
@@ -537,11 +552,11 @@
   describe "update with invalid object", :given => "a player exists" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => "a"}})
     end
 
-    it "should contain an error message" do
+    it "should show an error message" do
       @response.body.should contain("Player failed to be updated")
     end
   end
 
   describe "delete", :given => "a player exists" do
@@ -551,10 +566,10 @@
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"Delete model\"" do
+    it "should show \"Delete model\"" do
       @response.body.should contain("Delete player")
     end
   end
 
   describe "delete with missing object" do