spec/praxis/router_spec.rb in praxis-2.0.pre.9 vs spec/praxis/router_spec.rb in praxis-2.0.pre.10

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Praxis::Router do
   describe Praxis::Router::VersionMatcher do
-    let(:resource_definition){ double("resource_definition", version_options: { using: [:header, :params] }) }
-    let(:action){ double("action", resource_definition: resource_definition ) }
+    let(:endpoint_definition){ double("endpoint_definition", version_options: { using: [:header, :params] }) }
+    let(:action){ double("action", endpoint_definition: endpoint_definition ) }
     let(:target){ double("target", action: action ) }
     let(:args){ {version: "1.0"} }
     subject(:matcher){ Praxis::Router::VersionMatcher.new(target,**args) }
 
     context '.initialize' do
@@ -78,12 +78,12 @@
 
     let(:route){ double('route', options: [1], version: 1, verb: 'verb', path: 'path')}
     let(:target){ double('target') }
     let(:verb_router){ double('verb_router') }
 
-    let(:resource_definition) { double('resource_definition', version_options: {using: [:header, :params]} ) }
-    let(:action) { double('action', resource_definition: resource_definition) }
+    let(:endpoint_definition) { double('endpoint_definition', version_options: {using: [:header, :params]} ) }
+    let(:action) { double('action', endpoint_definition: endpoint_definition) }
     let(:target) { double('target', action: action) }
 
 
     context 'with params or header versioning' do
       it 'wraps the target with a VersionMatcher' do
@@ -109,12 +109,12 @@
     let(:router_response_for_post){ "POST result" }
     let(:router_response_for_wildcard){ "* result" }
     let(:post_target_router){ double("POST target", call: router_response_for_post) }
     let(:any_target_router){ double("ANY target", call: router_response_for_wildcard) }
 
-    let(:resource_definition) { double('resource_definition', version_options: {using: [:header, :params]} ) }
-    let(:action) { double('action', resource_definition: resource_definition) }
+    let(:endpoint_definition) { double('endpoint_definition', version_options: {using: [:header, :params]} ) }
+    let(:action) { double('action', endpoint_definition: endpoint_definition) }
     let(:target) { double('target', action: action) }
 
     before do
       env['HTTP_X_API_VERSION'] = request_version if request_version
       allow_any_instance_of(Praxis::Router::RequestRouter).
@@ -140,11 +140,11 @@
         end
       end
     end
 
     context 'for routes with wildcards (a POST and a * route)' do
-      let(:resource_definition) { double('resource_definition', version_options: {using: [:header, :params]} ) }
-      let(:action) { double('action', resource_definition: resource_definition) }
+      let(:endpoint_definition) { double('endpoint_definition', version_options: {using: [:header, :params]} ) }
+      let(:action) { double('action', endpoint_definition: endpoint_definition) }
       let(:target) { double('target', action: action) }
 
       before do
         router.add_route(target,double("route2", verb: 'ANY', path: '/*', options: {} , version: request_version))
         # Hijack the callable block in the routes (since there's no way to point back to the registered route object)