spec/private/grapher_spec.rb in usher-0.4.8 vs spec/private/grapher_spec.rb in usher-0.5.1

@@ -2,34 +2,33 @@
 
 
 describe "Usher grapher" do
 
   before(:each) do
-    @route_set = Usher.new
+    @route_set = Usher.new(:generator => Usher::Util::Generators::URL.new)
     @route_set.reset!
-    @url_generator = Usher::Generators::URL.new(@route_set)
   end
 
   it "should find a simple path" do
     @route_set.add_route('/:a/:b/:c')
-    @url_generator.generate(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
+    @route_set.generator.generate(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
   end
 
   it "should pick a more specific route" do
     @route_set.add_route('/:a/:b')
     @route_set.add_route('/:a/:b/:c')
-    @url_generator.generate(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
+    @route_set.generator.generate(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
   end
 
   it "should fail to generate a route when none matches" do
     @route_set.add_route('/:a/:b')
-    proc {@url_generator.generate(nil, {:c => 'C', :d => 'D'}) }.should raise_error Usher::UnrecognizedException
+    proc {@route_set.generator.generate(nil, {:c => 'C', :d => 'D'}) }.should raise_error Usher::UnrecognizedException
   end
 
   it "should find the most specific route and append extra parts on as a query string" do
     @route_set.add_route('/:a/:b/:c')
     @route_set.add_route('/:a/:b')
-    @url_generator.generate(nil, {:a => 'A', :b => 'B', :d => 'C'}).should == '/A/B?d=C'
+    @route_set.generator.generate(nil, {:a => 'A', :b => 'B', :d => 'C'}).should == '/A/B?d=C'
   end
   
   # FIXME
   #it "should do a validity check against the incoming variables when asked to" do
   #  route_set.add_route('/:a/:b', :b => /\d+/)
\ No newline at end of file