config/environments/cucumber.rb features/forums.feature features/step_definitions/app_steps.rb features/step_definitions/forums_steps.rb features/step_definitions/webrat_steps.rb features/subscriptions.feature features/support/blueprints.rb features/support/env.rb features/support/paths.rb features/support/setup.rb vendor/plugins/cucumber vendor/plugins/machinist/.autotest vendor/plugins/machinist/MIT-LICENSE vendor/plugins/machinist/README.markdown vendor/plugins/machinist/Rakefile vendor/plugins/machinist/init.rb vendor/plugins/machinist/lib/machinist.rb vendor/plugins/machinist/lib/machinist/active_record.rb vendor/plugins/machinist/lib/sham.rb vendor/plugins/machinist/machinist.gemspec vendor/plugins/machinist/spec/db/.gitignore vendor/plugins/machinist/spec/db/database.yml vendor/plugins/machinist/spec/db/schema.rb vendor/plugins/machinist/spec/log/.gitignore vendor/plugins/machinist/spec/machinist_spec.rb vendor/plugins/machinist/spec/sham_spec.rb vendor/plugins/machinist/spec/spec_helper.rb @@ -0,0 +1,3 @@ +[submodule "vendor/plugins/cucumber"] + path = vendor/plugins/cucumber + url = git://github.com/aslakhellesoy/cucumber.git .gitmodules @@ -1,8 +1,8 @@ class SubscriptionsController < ApplicationController before_filter :find_topic, :only => [:create] before_filter :login_required - before_filter :store_location, :only => [:index] before_filter :can_not_subscribe? + before_filter :store_location, :only => [:index] def index @subscriptions = current_user.subscriptions.all(:joins => :topic, :order => "updated_at DESC") app/controllers/subscriptions_controller.rb @@ -15,7 +15,7 @@ class Post < ActiveRecord::Base validates_length_of :text, :minimum => 4 validates_presence_of :text - unless THINKING_SPHINX + unless SEARCHING define_index do indexes text set_property :delta => true app/models/post.rb @@ -33,7 +33,7 @@ class Topic < ActiveRecord::Base after_create :increment_counters before_destroy :decrement_counters - unless THINKING_SPHINX + unless SEARCHING define_index do indexes subject end app/models/topic.rb @@ -30,7 +30,9 @@ <%= link_to t(:Edit_Profile), [:edit, current_user] %> | <%= link_to t(:Member_List), users_path %> | <%= link_to t(:x_new_messages, :count => @current_user.unread_messages.size), messages_path %> | - <%= link_to t(:Subscriptions), subscriptions_path %> | + <% if current_user.can?(:subscribe) %> + <%= link_to t(:Subscriptions), subscriptions_path %> | + <% end %> <%= link_to t(:Logout), logout_path %> <% end %> </div> app/views/layouts/application.html.erb @@ -6,7 +6,7 @@ <% fields_for @post do |post| %> <tr> - <td valign='top'><%= f.label 'text', t(:Text) %></td> + <td valign='top'><%= post.label 'text', t(:Text) %></td> <td><%= post.text_area "text", :cols => "80" %></td> </tr> <% end %> app/views/topics/_form.html.erb @@ -13,7 +13,7 @@ end if File.readlines(database).empty? raise "Your database.yml file is empty. Please add your database information." end -Rails::Initializer.run do |config| +CONFIG = Rails::Initializer.run do |config| config.gem 'chronic' config.gem 'RedCloth' @@ -49,7 +49,7 @@ THEMES_DIRECTORY = File.join(RAILS_ROOT, "public", "themes") STANDALONE = true ## Set this to false if you don't want to use thinking sphinx. -THINKING_SPHINX = true +SEARCHING = true # Change this if your locale is not english # I18n.default_locale = "en" config/environment.rb @@ -1,7 +1,16 @@ -$:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') -require 'cucumber/rake/task' +$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib') -Cucumber::Rake::Task.new(:features) do |t| - t.cucumber_opts = "--format pretty" +begin + require 'cucumber/rake/task' + + Cucumber::Rake::Task.new(:features) do |t| + t.fork = true + t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')] + end + task :features => 'db:test:prepare' +rescue LoadError + desc 'Cucumber rake task not available' + task :features do + abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin' + end end -task :features => 'db:test:prepare' \ No newline at end of file lib/tasks/cucumber.rake @@ -78,7 +78,7 @@ registered_group = Group.create!(:name => "Registered Users", :owner => administ puts "Generating some configuration options..." Configuration.create(:key => "default_group_id", :value => registered_group.id) - if THINKING_SPHINX + if SEARCHING puts "Configuring thinking sphinx..." Rake::Task['ts:config'] puts "Running the index..." lib/tasks/install.rake @@ -1,7 +1,8 @@ #!/usr/bin/env ruby begin load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber") -rescue LoadError +rescue LoadError => e + raise unless e.to_s =~ /cucumber/ require "rubygems" load File.join(Gem.bindir, "cucumber") end \ No newline at end of file script/cucumber 475be9cbf6df0d72f3734a4bdca600a9eb9e3118 Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/c659af3fbd35be6645a9807dbbaeb1dd5a3876c5 c659af3fbd35be6645a9807dbbaeb1dd5a3876c5 2009-06-01T04:07:33-07:00 2009-06-01T04:07:33-07:00 Starting out writing features for rboard. Fixed endless subscriptions index page redirection ff4885d671e7660b5436deed64c297ae20d8835b Ryan Bigg radarlistener@gmail.com