Refactor Cucumber.Parser to accept a hash of features instead of a si…

…ngle feature source string (wip #14)
cucumber · Aug 9, 2011 · dc16a2c · dc16a2c
1 parent 291e5cb
commit dc16a2c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/lib/cucumber/parser.js b/lib/cucumber/parser.js
@@ -1,4 +1,4 @@
-var Parser = function(featuresSource) {
+var Parser = function(featureSources) {
   var Gherkin  = require('gherkin');
   var Cucumber = require('../cucumber');
 
@@ -8,7 +8,8 @@ var Parser = function(featuresSource) {
     parse: function parse() {
       var Lexer = Gherkin.Lexer('en');
       var lexer = new Lexer(self.getEventHandlers());
-      lexer.scan(featuresSource);
+      for (i in featureSources)
+        lexer.scan(featureSources[i]);
       return features;
     },
 

diff --git a/lib/cucumber/runtime.js b/lib/cucumber/runtime.js
@@ -17,7 +17,7 @@ var Runtime = function(featuresSource, supportCodeDefinition) {
     },
 
     parseFeaturesSource: function parseFeaturesSource(featuresSource) {
-      var parser = Cucumber.Parser(featuresSource);
+      var parser = Cucumber.Parser({feature: featuresSource});
       return parser.parse();
     },
 

diff --git a/spec/cucumber/parser_spec.js b/spec/cucumber/parser_spec.js
@@ -2,14 +2,17 @@ require('../support/spec_helper');
 
 describe("Cucumber.Parser", function() {
   var Cucumber = require('cucumber');
-  var parser, featuresSource;
+  var parser, featureSources;
   var features;
 
   beforeEach(function() {
     features       = createSpy("Root 'features' AST element");
+    featureSources = {
+      first_feature  : createSpy('first feature source'),
+      second_feature : createSpy('second feature source')
+    }
     spyOn(Cucumber.Ast, 'Features').andReturn(features);
-    featuresSource = createSpy('features source string');
-    parser         = Cucumber.Parser(featuresSource);
+    parser = Cucumber.Parser(featureSources);
   });
 
   describe("constructor", function() {
@@ -46,9 +49,10 @@ describe("Cucumber.Parser", function() {
       expect(gherkinLexerConstructor).toHaveBeenCalledWith(eventHandlers);
     });
 
-    it("asks the lexer to scan the features source", function() {
+    it("asks the lexer to scan each feature source", function() {
       parser.parse();
-      expect(gherkinLexer.scan).toHaveBeenCalledWith(featuresSource);
+      expect(gherkinLexer.scan).toHaveBeenCalledWith(featureSources['first_feature']);
+      expect(gherkinLexer.scan).toHaveBeenCalledWith(featureSources['second_feature']);
     });
 
     it("returns the features root element", function() {

diff --git a/spec/cucumber/runtime_spec.js b/spec/cucumber/runtime_spec.js
@@ -80,12 +80,12 @@ describe("Cucumber.Runtime", function() {
 
     it("creates a new parser", function() {
       runtime.parseFeaturesSource(featuresSource);
-      expect(Cucumber.Parser).toHaveBeenCalledWith(featuresSource);
+      expect(Cucumber.Parser).toHaveBeenCalledWith({feature: featuresSource});
     });
 
     it("asks the parser to parse", function() {
       runtime.parseFeaturesSource(featuresSource);
-      expect(Cucumber.Parser).toHaveBeenCalled();
+      expect(parser.parse).toHaveBeenCalled();
     });
 
     it("it returns the parsed features", function() {