wally 0.0.40 → 0.0.41

data/.gitignore

@@ -4,3 +4,4 @@
 Gemfile.lock
 pkg/*
 .wally
+chromedriver.log

data/Rakefile

@@ -1,5 +1,5 @@
 require "bundler/gem_tasks"
 
 task :sample do
-  sh "bin/wally push http://localhost:4567/project features/"
+  sh "bin/wally push http://localhost:4567/projects/project1 features/"
 end

data/example-features/generic/example-with-data-table.feature

@@ -0,0 +1,7 @@
+Feature: Data Table
+
+  Scenario: Data Table
+    Given a data table:
+      | a | b | c |
+      | 1 | 2 | 3 |
+      | 4 | 5 | 6 |

data/example-features/generic/example-with-scenario-outline-examples.feature

@@ -0,0 +1,11 @@
+Feature: Scenario Outline
+
+  Scenario Outline: Outline with examples
+    Given there are <start> cucumbers
+    When I eat <eat> cucumbers
+    Then I should have <left> cucumbers
+
+    Examples:
+      | start | eat | left |
+      |  12   |  5  |  7   |
+      |  20   |  5  |  15  |

data/features/counts.feature

@@ -18,8 +18,8 @@ Feature: Counts
 
   Scenario: Features
     When I visit the project page
-    Then I should see "Features (1)"
+    Then I see "Features (1)"
 
   Scenario: Tags
     When I visit the project page
-    Then I should see "Tags (5)"
+    Then I see "Tags (5)"

data/features/feature_page.feature

@@ -12,7 +12,7 @@ Feature: Feature Page
       I want to create value
      """
     When I visit the sample feature page
-    Then I should see the feature free-form narrative
+    Then I see the feature free-form narrative
 
   Scenario: Tags
     Given a feature file named "sample.feature" with the contents:
@@ -21,7 +21,7 @@ Feature: Feature Page
     Feature: Sample Feature
     """
     When I visit the sample feature page
-    Then I should see "sample_tag"
+    Then I see "sample_tag"
 
  Scenario: Scenario Links
     Given a feature file named "sample.feature" with the contents:
@@ -42,7 +42,7 @@ Feature: Feature Page
       Then I go happy
      """
     When I visit the sample feature page
-    Then I should see Scenario headers as links
+    Then I see Scenario headers as links
 
   Scenario: Sort Scenario Links in Alphabetical Order
     Given a feature file named "sample.feature" with the contents:
@@ -65,5 +65,5 @@ Feature: Feature Page
     Scenario: Sample Aidy
     """
     When I visit the sample feature page
-    Then I should see "tag1"
-    And I should see "tag2"
+    Then I see "tag1"
+    And I see "tag2"

data/features/list_tags.feature

@@ -14,7 +14,18 @@ Feature: List Tags
     Scenario: Tag Scenario 2
     """
     When I visit the project page
-    Then I should see a link to "@tag1 (1)" with the url "/projects/project/search?q=@tag1"
-    And I should see a link to "@tag2 (1)" with the url "/projects/project/search?q=@tag2"
-    And I should see a link to "@tag3 (1)" with the url "/projects/project/search?q=@tag3"
-    And I should see a link to "@multiple (2)" with the url "/projects/project/search?q=@multiple"
+    Then I see a link to "@tag1 (1)" with the url "/projects/project/search?q=@tag1"
+    And I see a link to "@tag2 (1)" with the url "/projects/project/search?q=@tag2"
+    And I see a link to "@tag3 (1)" with the url "/projects/project/search?q=@tag3"
+    And I see a link to "@multiple (2)" with the url "/projects/project/search?q=@multiple"
+
+    Scenario: Coloured tags
+      Given a feature file named "sample.feature" with the contents:
+      """
+      @tag1
+      Feature: Tag Feature
+      @tag2 @tag3
+      Scenario: Tag Scenario 1
+      """
+      When I visit the project page
+      Then I see each tag has an individual colour

data/features/notifications.feature

@@ -6,4 +6,4 @@ Feature: Notifications
   Scenario: Ten @wip tags
     Given a feature file with 10 @wip tags
     When I visit the project page
-    Then I should see a notification that says "You have 10 @wip tags :("
+    Then I see a notification that says "You have 10 @wip tags :("

data/features/progress_bar.feature

@@ -7,19 +7,15 @@ Feature: Progress Bar
     Given a feature file on the project "project_name" with the contents:
     """
     Feature: Mixed
-    
+
     @wip
     Scenario: WiP
 
     @notstarted
     Scenario: Not Started
-    """ 
+    """
     When I visit the project page for "project_name" 
     And I select "Progress"
-    Then I should see "This project has 2 scenarios"
-    And I should see "@wip (50%)"
-    And I should see "@notstarted (50%)"
-    
-
-
-
+    Then I see "This project has 2 scenarios"
+    And I see "@wip (50%)"
+    And I see "@notstarted (50%)"

data/features/project_home.feature

@@ -21,5 +21,5 @@ Feature: Project Home Page
     Feature: Elle Macpherson
     """
     When I visit the project page
-    Then I should see a link to my sample features
+    Then I see a link to my sample features
     And the features are ordered alphabetically

data/features/projects.feature

@@ -9,4 +9,4 @@ Feature: Projects
     Feature: Projects
     """
     And I visit the project page for "project_name"
-    Then I should see a link to the feature "Projects"
+    Then I see a link to the feature "Projects"

data/features/push_features.feature

@@ -6,15 +6,15 @@ Feature: Push Features To Server
   Scenario: Push features without authentication
     Given I don't have a .wally authorisation file
     When I put data to /my_project_name/features with the authentication code
-    Then I should get a 403 http status
+    Then I get a 403 http status
 
   Scenario: Push features with authentication
     Given I have a .wally authentication file
     When I put data to /my_project_name/features with the authentication code
-    Then I should get a 201 http status
+    Then I get a 201 http status
 
   Scenario: Pushed features show up on home page
     Given I have a .wally authentication file
     When I put data to /my_project_name/features with the authentication code
     And I visit "my_project_name" page
-    Then I should see the uploaded feature
+    Then I see the uploaded feature

data/features/scenario_page.feature

@@ -17,8 +17,8 @@ Feature: Scenario Page
     When I visit the sample feature page
     And click on a scenario header link
     Then a page appears with the scenario content
-    And I should see "tag1"
-    And I should see "tag2"
+    And I see "tag1"
+    And I see "tag2"
 
   Scenario: Background
     Given a feature file named "sample.feature" with the contents:
@@ -47,4 +47,38 @@ Feature: Scenario Page
      """
     When I visit the sample feature page
     And click on a scenario header link
-    Then I should see "work_in_progress"
+    Then I see "work_in_progress"
+
+  Scenario: Data Table
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Sample Feature
+
+      Scenario: Data Table
+        Given the following people exist:
+          | name   | email            |
+          | Aidy   | aidy@example.com |
+          | Andrew | vos@example.com  |
+    """
+    When I visit the sample feature page
+    And click on a scenario header link
+    Then I see the data table
+
+  Scenario: Scenario Outline
+    Given a feature file named "sample.feature" with the contents:
+    """
+    Feature: Sample Feature
+
+      Scenario Outline: Outline with examples
+        Given there are <start> cucumbers
+        When I eat <eat> cucumbers
+        Then I have <left> cucumbers
+
+        Examples:
+          | start | eat | left |
+          |  12   |  5  |  7   |
+          |  20   |  5  |  15  |
+    """
+    When I visit the sample feature page
+    And click on a scenario header link
+    Then I see the examples table

data/features/search_features.feature

@@ -11,7 +11,7 @@ Feature: Search features
     """
     And I am on the search page
     When I search for "<query>"
-    Then I should see a search result link to "<feature name>" with the url "<url>"
+    Then I see a search result link to "<feature name>" with the url "<url>"
 
     Examples:
       | query        | feature name   | url                      |
@@ -29,7 +29,7 @@ Feature: Search features
     """
     And I am on the search page
     When I search for "donkey"
-    Then I should see a search result link to "Sample Feature" with the url "/projects/project/features/sample-feature"
+    Then I see a search result link to "Sample Feature" with the url "/projects/project/features/sample-feature"
 
   Scenario: Search scenario name
     Given a feature file named "sample.feature" with the contents:
@@ -39,7 +39,7 @@ Feature: Search features
     """
     And I am on the search page
     When I search for "Sample Scenario"
-    Then I should see a search result link to "Sample Scenario" with the url "/projects/project/features/sample-feature/scenario/sample-scenario"
+    Then I see a search result link to "Sample Scenario" with the url "/projects/project/features/sample-feature/scenario/sample-scenario"
 
   Scenario: Search scenario steps
     Given a feature file named "sample.feature" with the contents:
@@ -50,7 +50,7 @@ Feature: Search features
     """
     And I am on the search page
     When I search for "I do something"
-    Then I should see a search result link to "Sample Scenario" with the url "/projects/project/features/sample-feature/scenario/sample-scenario"
+    Then I see a search result link to "Sample Scenario" with the url "/projects/project/features/sample-feature/scenario/sample-scenario"
 
   Scenario: Search suggests other searches
     Given a feature file named "sample.feature" with the contents:
@@ -59,8 +59,8 @@ Feature: Search features
     """
     And I am on the search page
     When I search for "btman"
-    Then I should see "Did you mean"
-    And I should see a search result link to "Batman" with the url "/projects/project/search?q=Batman"
+    Then I see "Did you mean"
+    And I see a search result link to "Batman" with the url "/projects/project/search?q=Batman"
 
   Scenario: Search displays tags
     Given a feature file named "sample.feature" with the contents:
@@ -73,23 +73,28 @@ Feature: Search features
     """
     And I am on the search page
     When I search for "Batman"
-    Then I should see "feature_tag" in the search results
-    And I should see "scenario_tag" in the search results
+    Then I see "feature_tag" in the search results
+    And I see "scenario_tag" in the search results
 
-  Scenario: Higlighted search result
-    Given a feature file named "sample.feature" with the contents:
+  Scenario: Highlighted search result with multiple matches
+    Given a feature file named "sample1.feature" with the contents:
     """
     @feature_tag
     Feature: Some <long WORD feature word name
     Scenario: Some <long WORD scenario word name
+    Given I have a word
     """
     And I am on the search page
     When I search for "word"
-    Then I should see the html:
+    Then I see the html:
     """
     Some &lt;long <span class="search-result">WORD</span> feature <span class="search-result">word</span> name
     """
-    And I should see the html:
+    And I see the html:
     """
     Some &lt;long <span class="search-result">WORD</span> scenario <span class="search-result">word</span> name
     """
+    And I see the html:
+    """
+    I have a <span class="search-result">word</span>
+    """

data/features/step_definitions/feature_page_steps.rb

@@ -1,10 +1,10 @@
-Then /^I should see the feature free\-form narrative$/ do
+Then /^I see the feature free\-form narrative$/ do
   page.should have_content "In order to get some value"
   page.should have_content "As a person"
   page.should have_content "I want to create value"
 end
 
-Then /^I should see Scenario headers as links$/ do
+Then /^I see Scenario headers as links$/ do
   page.body.should have_content "Scenarios"
   page.should have_link "Sample Aidy", :href => "/projects/project/features/sample-feature/scenario/sample-aidy"
   page.should have_link "Sample Andrew", :href => "/projects/project/features/sample-feature/scenario/sample-andrew"

data/features/step_definitions/notifications_steps.rb

@@ -6,6 +6,6 @@ Given /^a feature file with (\d+) @wip tags$/ do |wip_tag_count|
   create_feature("project", "sample1.feature", contents)
 end
 
-Then /^I should see a notification that says "([^"]*)"$/ do |text|
+Then /^I see a notification that says "([^"]*)"$/ do |text|
   page.should have_content text
 end

data/features/step_definitions/project_home_steps.rb

@@ -1,4 +1,4 @@
-Then /^I should see a link to my sample features$/ do
+Then /^I see a link to my sample features$/ do
   page.should have_link "Kate Moss", :href => "/projects/project/features/kate-moss"
   page.should have_link "Katie Price", :href => "/projects/project/features/katie-price"
   page.should have_link "Jessica-Jane Clement", :href => "/projects/project/features/jessica-jane-clement"

data/features/step_definitions/projects_steps.rb

@@ -6,6 +6,6 @@ Given /^I visit the project page for "([^"]*)"$/ do |project|
   visit "/projects/#{project}"
 end
 
-Then /^I should see a link to the feature "([^"]*)"$/ do |feature|
+Then /^I see a link to the feature "([^"]*)"$/ do |feature|
   page.should have_link feature
 end

data/features/step_definitions/push_features_steps.rb

@@ -12,11 +12,11 @@ Given /^I have a \.wally authentication file$/ do
   end
 end
 
-Then /^I should get a (\d+) http status$/ do |status|
+Then /^I get a (\d+) http status$/ do |status|
   page.driver.status_code.should eql status.to_i
 end
 
-Then /^I should see the uploaded feature$/ do
+Then /^I see the uploaded feature$/ do
   page.body.should have_content "Feature Name"
 end
 

data/features/step_definitions/scenario_page_steps.rb

@@ -1,5 +1,5 @@
 When /^click on a scenario header link$/ do
-  page.click_link "Sample Aidy"
+  find('.scenarios a').click
 end
 
 Then /^a page appears with the scenario content$/ do
@@ -13,3 +13,17 @@ Then /^the background is visible$/ do
   page.body.should have_content "Background:"
   page.body.should have_content "Given some things"
 end
+
+Then /^I see the data table$/ do
+  text_for_all('th').should == ['name', 'email']
+  text_for_all('td').should == ['Aidy', 'aidy@example.com', 'Andrew', 'vos@example.com']
+end
+
+Then /^I see the examples table$/ do
+  text_for_all('th').should == ['start', 'eat', 'left']
+  text_for_all('td').should == ['12', '5', '7', '20', '5', '15']
+end
+
+def text_for_all tag
+  page.all(tag).collect { |heading| heading.text.strip }
+end

data/features/step_definitions/search_features_steps.rb

@@ -7,18 +7,18 @@ When /^I search for "([^"]*)"$/ do |text|
   click_button 'Search'
 end
 
-Then /^I should see a search result link to "([^"]*)" with the url "([^"]*)"$/ do |text, url|
+Then /^I see a search result link to "([^"]*)" with the url "([^"]*)"$/ do |text, url|
   within ".content" do
     page.should have_link text, :href => url
   end
 end
 
-Then /^I should see "([^"]*)" in the search results$/ do |text|
+Then /^I see "([^"]*)" in the search results$/ do |text|
   within ".content" do
     page.should have_content text
   end
 end
 
-Then /^I should see the html:$/ do |html|
+Then /^I see the html:$/ do |html|
   page.body.should include html
 end

data/features/step_definitions/steps.rb

@@ -15,14 +15,21 @@ When /^I select "([^"]*)"$/ do |text|
   click_link text
 end
 
-Then /^I should see a link to "([^"]*)" with the url "([^"]*)"$/ do |text, url|
+Then /^I see a link to "([^"]*)" with the url "([^"]*)"$/ do |text, url|
   page.should have_link text, :href => url
 end
 
-Then /^I should see "([^"]*)"$/ do |text|
+Then /^I see "([^"]*)"$/ do |text|
   page.should have_content(text)
 end
 
 Then /^the total tag count is displayed$/ do
   save_and_open_page
 end
+
+Then /^I see each tag has an individual colour$/ do
+ find('a.tag-tag1').should be_visible
+ find('a.tag-tag2').should be_visible
+ find('a.tag-tag3').should be_visible
+end
+

data/features/step_definitions/welcome_page.rb

@@ -5,15 +5,16 @@ When /^I view the welcome page$/ do
   visit "/"
 end
 
-Then /^I should redirected to the "([^"]*)" project page$/ do |project|
-  page.current_url.should include "/projects/#{project}"
+Then /^I am redirected to the "([^"]*)" project page$/ do |project|
+  sleep 1
+  page.current_path.should include "/projects/#{project}"
 end
 
 When /^I select the project "([^"]*)"$/ do |project|
   select(project, :from => "projects")
 end
 
-Then /^"([^"]*)" should be rendered$/ do |text|
+Then /^"([^"]*)" is rendered$/ do |text|
   page.should have_content text
 end
 

data/features/support/env.rb

@@ -12,19 +12,10 @@ After do
   Wally::Project.delete_all
 end
 
-require 'headless'
-headless = Headless.new
-at_exit do
-  headless.destroy
-end
-
-Before("@selenium,@javascript", "~@no-headless") do
-  headless.start if Capybara.current_driver == :selenium
-end
-
-After("@selenium,@javascript", "~@no-headless") do
-  headless.stop if Capybara.current_driver == :selenium
+Capybara.register_driver :selenium_chrome do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :chrome)
 end
+Capybara.javascript_driver = :selenium_chrome
 
 def project name
   project = Wally::Project.first(:name => name)

data/features/welcome_page.feature

@@ -5,7 +5,7 @@ Feature: Welcome Page
   Scenario: No projects
     Given there aren't any projects
     When I view the welcome page
-    Then "Wally is a web-based Cucumber viewer and navigator" should be rendered
+    Then "Wally is a web-based Cucumber viewer and navigator" is rendered
 
   @javascript
   Scenario: Project links on home page
@@ -19,7 +19,7 @@ Feature: Welcome Page
     """
     When I view the welcome page
     And I select the project "sample2"
-    Then I should redirected to the "sample2" project page
+    Then I am redirected to the "sample2" project page
 
   Scenario: Redirect to first project
     Given a feature file on the project "sample1" with the contents:
@@ -27,4 +27,4 @@ Feature: Welcome Page
     Feature: Sample1
     """
     When I view the welcome page
-    Then I should redirected to the "sample1" project page
+    Then I am redirected to the "sample1" project page

data/lib/wally/application.rb

@@ -47,7 +47,7 @@ end
 
 def highlighted_search_result_blurb search_result
   offset = 0
-  highlighted = search_result.object.text
+  highlighted = search_result.object.text.dup
   span_start = "!!SPAN_START!!"
   span_end = "!!SPAN_END!!"
   search_result.matches.each do |match|
@@ -87,6 +87,10 @@ get '/?' do
   end
 end
 
+get '/robots.txt' do
+  "User-agent: *\nDisallow: /"
+end
+
 get '/projects/:project/?' do
   haml :project
 end

data/lib/wally/public/skin.css

@@ -194,3 +194,15 @@ section.feature p:first-child {
   background: white;
 }
 
+/* tags */
+
+.tag-blocked, .tag-irritating {
+    background: #f00;
+    color: #fff;
+    }
+
+.tag-wip {
+    background: #666FF;
+    color: #fff;
+    }
+    

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.40"
+  VERSION = "0.0.41"
 end

data/lib/wally/views/feature.haml

@@ -8,12 +8,12 @@
   %section{:class => 'feature'}
     :markdown
       #{@feature.gherkin["description"]}
-- if @feature.gherkin["description"]
-  %h2 Scenarios
-  %ul
-    - get_sorted_scenarios(@feature).each do |scenario|
-      %li
-        %a{:href => get_scenario_url(scenario)}
-          = scenario["name"]
-        - if scenario["tags"]
-          = haml :tag_links, {:locals => {:tags => scenario["tags"]}, :layout => false}
+  - if @feature.gherkin["description"]
+    %h2 Scenarios
+    %ul
+      - get_sorted_scenarios(@feature).each do |scenario|
+        %li
+          %a{:href => get_scenario_url(scenario)}
+            = scenario["name"]
+          - if scenario["tags"]
+            = haml :tag_links, {:locals => {:tags => scenario["tags"]}, :layout => false}

data/lib/wally/views/layout.haml

@@ -41,7 +41,7 @@
           %ul
             - tag_count.each do |tag, count|
               %li
-                %a{:href => "/projects/#{current_project.name}/search?q=#{tag}"}
+                %a{:href => "/projects/#{current_project.name}/search?q=#{tag}", :class => "tag-#{tag.delete('@')}"}
                   = "#{tag} (#{count})"
 
         %div.content

data/lib/wally/views/scenario.haml

@@ -20,19 +20,12 @@
       %span.step-keyword
         = step["keyword"]
       = escape_once(step["name"])
+      - if step["rows"]
+        = haml :table, {:locals => {:rows => step["rows"]}, :layout => false}
 - else
   %p{:class => 'alert-message error'}
     = "Where's Wally? This scenario has no steps!?"
 - if @scenario["examples"]
   %h3 Examples:
-  %table{:class => 'zebra-striped'}
-    - @scenario["examples"].first["rows"].each_with_index do |row, index|
-      %tr
-        - row["cells"].each do |cell|
-          - if index === 0
-            %th
-              = escape_once(cell)
-          - else
-            %td
-              = escape_once(cell)
+  = haml :table, {:locals => {:rows => @scenario["examples"].first["rows"]}, :layout => false}
 

data/lib/wally/views/table.haml

@@ -0,0 +1,10 @@
+%table{:class => 'zebra-striped'}
+  - rows.each_with_index do |row, index|
+    %tr
+      - row["cells"].each do |cell|
+        - if index === 0
+          %th
+            = escape_once(cell)
+        - else
+          %td
+            = escape_once(cell)

data/lib/wally/views/tag_links.haml

@@ -1,4 +1,4 @@
 - tags.each do |tag|
   %span.label.notice
-    %a{:href => "/projects/#{current_project.name}/search?q=#{tag["name"]}"}
+    %a{:href => "/projects/#{current_project.name}/search?q=#{tag["name"]}", :class => "tag-#{tag["name"].delete('@')}"}
       = tag["name"]

data/wally.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "fakefs"
   s.add_development_dependency "launchy"
-  s.add_development_dependency "headless"
+  s.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -220,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: headless
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -252,6 +252,8 @@ files:
 - bin/wally
 - config.ru
 - example-features/generic/example-with-background.feature
+- example-features/generic/example-with-data-table.feature
+- example-features/generic/example-with-scenario-outline-examples.feature
 - example-features/generic/example_with_tags.feature
 - example-features/generic/has-lots-of-tags.feature
 - example-features/generic/multiple-scenarios.feature
@@ -296,6 +298,7 @@ files:
 - lib/wally/views/project.haml
 - lib/wally/views/scenario.haml
 - lib/wally/views/search.haml
+- lib/wally/views/table.haml
 - lib/wally/views/tag_links.haml
 - spec/spec_helper.rb
 - spec/wally/counts_tags_spec.rb