spec/generators/resource_generator_spec.rb in adminpanel-1.2.7 vs spec/generators/resource_generator_spec.rb in adminpanel-1.2.8

@@ -125,21 +125,19 @@
 
 			it "should generate model with description hash" do
 				subject.should generate("app/models/adminpanel/product.rb") { |content|
 					content.should =~ /'description' => \{/ &&
 					content.should =~ /'type' => 'wysiwyg_field',/&&
-					content.should =~ /'name' => 'description',/ &&
 					content.should =~ /'label' => 'description',/ &&
 					content.should =~ /'placeholder' => 'description'\}/
 				}
 			end
 
 			it "should generate model with name hash" do
 				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /'name' => \{/
-					content.should =~ /'type' => 'text_field',/
-					content.should =~ /'name' => 'name',/
-					content.should =~ /'label' => 'name',/
+					content.should =~ /'name' => \{/ &&
+					content.should =~ /'type' => 'text_field',/ &&
+					content.should =~ /'label' => 'name',/ &&
 					content.should =~ /'placeholder' => 'name'\}/
 				}
 			end
 
 			it "should generate model with overwritten sample_name" do