lib/ginatra.rb lib/ginatra/helpers.rb lib/ginatra/repo.rb lib/ginatra/repo_list.rb lib/sinatra/partials.rb @@ -1,7 +1,9 @@ require 'rubygems' require 'cucumber/rake/task' require 'spec/rake/spectask' -require "ginatra.rb" + +current_path = File.expand_path(File.dirname(__FILE__)) +require "#{current_path}/lib/ginatra" task :default => ['rake:spec', 'rake:features'] Rakefile @@ -4,7 +4,7 @@ Feature: Page I want to see the home page Scenario: - When I go to the homepage + When I open '/' Then I should see "Ginatra" And I should see "View My Rusty Git Repositories" And I should see "Test" features/pages.feature @@ -1,13 +1,9 @@ -Given /^I am on (.+)$/ do |page_name| - visit path_to(page_name) +Given /^I am on '([^\']*)'$/ do |path| + get path end When /^I open '([^\']*)'$/ do |path| - visit path -end - -When /^I go to (.+)$/ do |page_name| - visit path_to(page_name) + get path end When /^I press "([^\"]*)"$/ do |button| @@ -22,91 +18,12 @@ When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value| fill_in(field, :with => value) end -When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field| - select(value, :from => field) -end - -# Use this step in conjunction with Rail's datetime_select helper. For example: -# When I select "December 25, 2008 10:00" as the date and time -When /^I select "([^\"]*)" as the date and time$/ do |time| - select_datetime(time) -end - -# Use this step when using multiple datetime_select helpers on a page or -# you want to specify which datetime to select. Given the following view: -# <%%= f.label :preferred %><br /> -# <%%= f.datetime_select :preferred %> -# <%%= f.label :alternative %><br /> -# <%%= f.datetime_select :alternative %> -# The following steps would fill out the form: -# When I select "November 23, 2004 11:20" as the "Preferred" data and time -# And I select "November 25, 2004 10:30" as the "Alternative" data and time -When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label| - select_datetime(datetime, :from => datetime_label) -end - -# Use this step in conjunction with Rail's time_select helper. For example: -# When I select "2:20PM" as the time -# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat -# will convert the 2:20PM to 14:20 and then select it. -When /^I select "([^\"]*)" as the time$/ do |time| - select_time(time) -end - -# Use this step when using multiple time_select helpers on a page or you want to -# specify the name of the time on the form. For example: -# When I select "7:30AM" as the "Gym" time -When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label| - select_time(time, :from => time_label) -end - -# Use this step in conjunction with Rail's date_select helper. For example: -# When I select "February 20, 1981" as the date -When /^I select "([^\"]*)" as the date$/ do |date| - select_date(date) -end - -# Use this step when using multiple date_select helpers on one page or -# you want to specify the name of the date on the form. For example: -# When I select "April 26, 1982" as the "Date of Birth" date -When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label| - select_date(date, :from => date_label) -end - -When /^I check "([^\"]*)"$/ do |field| - check(field) -end - -When /^I uncheck "([^\"]*)"$/ do |field| - uncheck(field) -end - -When /^I choose "([^\"]*)"$/ do |field| - choose(field) -end - -When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field| - attach_file(field, path) -end - Then /^I should see "([^\"]*)"$/ do |text| - response.should contain(text) + last_response.should contain(text) end Then /^I should not see "([^\"]*)"$/ do |text| - response.should_not contain(text) -end - -Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value| - field_labeled(field).value.should =~ /#{value}/ -end - -Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value| - field_labeled(field).value.should_not =~ /#{value}/ -end - -Then /^the "([^\"]*)" checkbox should be checked$/ do |label| - field_labeled(label).should be_checked + last_response.should_not contain(text) end Then /^I should be on (.+)$/ do |page_name| features/step_definitions/page_steps.rb @@ -1,25 +1,12 @@ -# Sinatra -app_file = File.join(File.dirname(__FILE__), *%w[.. .. ginatra.rb]) -require app_file -# Force the application name because polyglot breaks the auto-detection logic. -Sinatra::Application.app_file = app_file - -# RSpec matchers -require 'spec/expectations' - -# Webrat -require 'webrat' -Webrat.configure do |config| - config.mode = :sinatra -end - -require "#{File.dirname(__FILE__)}/paths.rb" +current_path = File.expand_path(File.dirname(__FILE__)) +require "#{current_path}/../../spec/spec_helper" World do - include NavigationHelpers - session = Webrat::SinatraSession.new - session.extend(Webrat::Matchers) - session.extend(Webrat::HaveTagMatcher) - session + def app + Ginatra::App + end + include Rack::Test::Methods + include Webrat::Methods + include Webrat::Matchers end features/support/env.rb @@ -1,7 +1,7 @@ -require 'sinatra' -require 'rubygems' - -set :run, false - -require 'ginatra.rb' -run Sinatra::Application +current_path = File.expand_path(File.dirname(__FILE__)) + +require "#{current_path}/lib/ginatra" + +map '/' do + run Ginatra::App +end rackup.ru @@ -7,7 +7,7 @@ describe "Ginatra" do before(:each) do @ginatra_repolist = Ginatra::RepoList.new @ginatra_repo = @ginatra_repolist.find("test") - @grit_repo = Grit::Repo.new(File.join(Sinatra::Application.git_dir, "test.git"), {}) + @grit_repo = Grit::Repo.new(File.join(Ginatra::App.git_dir, "test.git"), {}) end it "should have a name" do @@ -32,7 +32,7 @@ describe "Ginatra" do end it "should be the same thing using #find or #new" do - Ginatra::RepoList.new.find("test") == Ginatra::Repo.new(File.join(Sinatra::Application.git_dir, "test.git")) + Ginatra::RepoList.new.find("test") == Ginatra::Repo.new(File.join(Ginatra::App.git_dir, "test.git")) end end @@ -59,7 +59,7 @@ describe "Ginatra" do before(:each) do @ginatra_multirepolist = Ginatra::MultiRepoList.new @ginatra_multirepo = @ginatra_multirepolist.find("test") - @grit_repo = Grit::Repo.new(File.join(Sinatra::Application.git_dir, "test.git")) + @grit_repo = Grit::Repo.new(File.join(Ginatra::App.git_dir, "test.git")) end it "should have a name" do @@ -84,7 +84,7 @@ describe "Ginatra" do end it "should create the same thing using .create! or .new" do - Ginatra::MultiRepoList.new.find("test") == Ginatra::MultiRepo.new(File.join(Sinatra::Application.git_dir, "test.git")) + Ginatra::MultiRepoList.new.find("test") == Ginatra::MultiRepo.new(File.join(Ginatra::App.git_dir, "test.git")) end end spec/ginatra_spec.rb @@ -1,20 +1,29 @@ require 'rubygems' -require 'sinatra' + +gem 'rspec' +require 'spec' + +current_path = File.expand_path(File.dirname(__FILE__)) +require "#{current_path}/../lib/ginatra" + +gem 'webrat', '~>0.4.4' +require 'webrat/sinatra' +gem 'rack-test', '~>0.3.0' require 'rack/test' - -module RackTestMethods - def app - Sinatra::Application.new - end + +Webrat.configure do |config| + config.mode = :sinatra end - + +Ginatra::App.set :environment, :test Spec::Runner.configure do |config| - config.include Rack::Test::Methods - config.include RackTestMethods -end - -require 'ginatra' - -@app = Sinatra::Application + def app + Ginatra::App + end + + config.include(Rack::Test::Methods) + config.include(Webrat::Methods) + config.include(Webrat::Matchers) +end spec/spec_helper.rb @@ -1,7 +1,7 @@ <h3>Repositories</h3> <div class="active repo-list"> <div class="commit-info"> - <%=h Sinatra::Application.description %> + <%=h Ginatra::App.description %> </div> <dl> <% @repo_list.each do |repo| %> views/index.erb features/support/paths.rb ginatra.rb 82dcd0abf7c7b0e45b818b82dbd9cabfcd716d02 Samuel Elliott sam@lenary.co.uk http://github.com/lenary/ginatra/commit/aa2eda6a7b0ea5dad113a186a65c15f235a50a82 aa2eda6a7b0ea5dad113a186a65c15f235a50a82 2009-06-15T06:55:42-07:00 2009-06-15T06:55:42-07:00 Converted Ginatra to a Classy Sinatra App. The main App logic is now in `Ginatra::App`, and the other peices of Ginatra are now in files in lib. The app still works by running `shotgun rackup.ru` or using any of the other ways of mounting a rackup file as an app. 3d3f6010b0631bae58778fa9c6b1c656f78167be Samuel Elliott sam@lenary.co.uk