spec/cucumber_helper.rb @@ -5,25 +5,23 @@ end Given /^I have one user "([^\"]*)" with password "([^\"]*)"$/ do |login, password| - User.gen!(:login => login, + User.make(:login => login, :password => password, :password_confirmation => password) end Given /^I have one admin user "([^\"]*)" with password "([^\"]*)"$/ do |login, password| - User.gen!(:admin, :login => login, + User.make(:admin, :login => login, :password => password, :password_confirmation => password) end Given /^"([^\"]*)" is project admin of "([^\"]*)" project$/ do |login, project_name| - user = User.first(:login => login) - project = Project.first(:name => project_name) - member = Member.new(:user_id => user.id) - function = Function.first(:project_admin => true) ? Function.first(:project_admin => true) : Function.gen!(:admin) - member.function_id = function.id - member.project_id = project.id - member.save! + user = User.first(:conditions => {:login => login}) + project = Project.first(:condtions => {:name => project_name}) + function = Function.first(:conditions => {:project_admin => true}) ? Function.first(:conditions => {:project_admin => true}) : Function.make(:admin) + project.project_members << ProjectMember.new(:user => user, :function => function) + project.save! user.should be_admin(project) end features/authentication/steps/login_steps.rb @@ -27,16 +27,18 @@ Then /^the (.*) ?request should fail/ do |_| end Given /^I have a project "([^\"]*)"$/ do |name| - unless Project.first(:name => name) + unless Project.first(:conditions => {:name => name}) lambda do - Project.gen!(:name => name) + make_project(:name => name) end.should change(Project, :count) end end Given /^I have a project "([^\"]*)" without members$/ do |name| Given %{I have a project "#{name}"} - Project.first(:name => name).members.each {|m| m.destroy} + pm = Project.first(:conditions => {:name => name}) + pm.project_members = [] + pm.save end Then /^"([^\"]*)" "([^\"]*)" "([^\"]*)" doesn't exist$/ do |klass, attribute, value| @@ -44,61 +46,53 @@ Then /^"([^\"]*)" "([^\"]*)" "([^\"]*)" doesn't exist$/ do |klass, attribute, va end Given /^"([^\"]*)" not admin on project "([^\"]*)"$/ do |login, project_name| - project = Project.first(:name => project_name) - member = project.members('user.login' => login) - if !member.empty? && member.project_admin? - member.function = Function.not_admin - member.save - end + project = Project.first(:conditions => {:name => project_name}) + project.project_members.each {|pm| + if pm.user.login == login + pm.function = Function.not_admin + end + } + project.save end Given /^(\d+) tickets with state "([^\"]*)" on project "(.*)"$/ do |num, state_name, project_name| - state = State.first(:name => state_name) - state = State.gen!(:name => state_name) unless state - project = Project.first(:name => project_name) - project = Project.gen(:name => project_name) unless project + state = State.first(:conditions => {:name => state_name}) || State.make(:conditions => {:name => state_name}) + project = Project.first(:name => project_name) || Project.make(:conditions => {:name => project_name}) num.to_i.times { - Ticket.gen(:state_id => state.id, - :project_id => project.id) + Ticket.make(:state => state, + :project => project) } end Given /^(\d+) tickets with state "([^\"]*)" and tag "([^\"]*)" on project "([^\"]*)"$/ do |num, state_name, tag_name, project_name| - state = State.first(:name => state_name) - state = State.gen!(:name => state_name) unless state - project = Project.first(:name => project_name) - project = Project.gen(:name => project_name) unless project + state = State.first(:conditions => {:name => state_name}) || State.make(:name => state_name) + project = Project.first(:conditions => {:name => project_name}) || Project.make(:name => project_name) num.to_i.times { - Ticket.gen(:state_id => state.id, - :project_id => project.id, + Ticket.make(:state => state, + :project => project, :tag_list => tag_name) } end def user_with_name(name) - user = User.first(:login => name) - user = User.gen(:login => name) unless user - user + User.first(:conditions => {:login => name}) || User.make(:login => name) end def project_with_name(name) - project = Project.first(:name => name) - project = Project.gen(:name => name) unless project - project + Project.first(:conditions => {:name => name}) || Project.gen(:name => name) end def function_with_name(name) - function = Function.first(:name => name) - function = Function.gen(:name => name, - :project_admin => (name == 'admin')) unless function - function + Function.first(:conditions => {:name => name}) || Function.make(:name => name, + :project_admin => (name == 'admin')) end Given /^I have user "([^\"]*)" with function "([^\"]*)" on project "([^\"]*)"$/ do |user_name, function_name, project_name| user = user_with_name(user_name) project = project_with_name(project_name) function = function_with_name(function_name) - member = project.members.create(:user => user, :function => function) + project.project_members << ProjectMember.new(:user => user, :function => function) + project.save end Given /^I have user "([^\"]*)" with function "([^\"]*)" on project "([^\"]*)" and no other user$/ do |user_name, function_name, project_name| @@ -106,25 +100,24 @@ Given /^I have user "([^\"]*)" with function "([^\"]*)" on project "([^\"]*)" an user = user_with_name(user_name) project = project_with_name(project_name) - project.members.all(:user_id.not => user.id).each { |m| m.destroy } + project.project_members.delete_if{ |pm| pm.user_id != user.id } + project.save! end Then /^the member "([^\"]*)" has function "([^\"]*)" in project "([^\"]*)"$/ do |user_name, function_name, project_name| - User.first(:login => user_name).members.first(:project_id => Project.first(:name => project_name).id).function.name.should == function_name -end - -When /transaction commit/ do - transaction = DataMapper.repository(:default).adapter.pop_transaction - transaction.commit + u = User.first(:conditions => {:login => user_name}) + pr = Project.first(:conditions => {:name => project_name}) + pr.project_members.should_not be_empty + pr.project_members.find{|pm| pm.user_id = u.id} end Given /^I have state "([^\"]*)"$/ do |name| - State.gen(:name => name) if State.first(:name => name).nil? + State.make(:name => name) unless State.first(:conditions => {:name => name}) end Then /^I have (\d+) ticket on project "([^\"]+)"$/ do |num_ticket, project_name| - Project.all(:name => project_name).count.should == 1 - Project.first(:name => project_name).tickets.count.should == num_ticket.to_i + Project.count(:name => project_name).should == 1 + Project.first(:conditions => {:name => project_name}).tickets.count.should == num_ticket.to_i end Then /^I should see an? ([^\"]*) message with "([^\"]*)"$/ do |class_name, content| @@ -140,8 +133,8 @@ Then /^I should see an? ([^\"]*) message with child "([^\"]*)"$/ do |class_name, end Given /^I create (\d+) ticket on project "([^\"]*)"$/ do |number, project_name| - project = Project.first(:name => project_name) + project = Project.first(:conditions => {:name => project_name}) number.to_i.times do - Ticket.gen(:project_id => project.id, :num => project.new_num_ticket) + Ticket.make(:project => project) end end features/steps/result_steps.rb @@ -10,7 +10,7 @@ end require "merb-core" require "spec" require "merb_cucumber/world/webrat" -require "merb_cucumber/helpers/datamapper" +require 'spec/cucumber_helper' # Uncomment if you want transactional fixtures Merb::Test::World::Base.use_transactional_fixtures @@ -19,6 +19,6 @@ Merb::Test::World::Base.use_transactional_fixtures # http://gist.github.com/37930 def Spec.run? ; true; end -Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') +Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'cucumber') -require File.join(File.dirname(__FILE__), '../../spec/fixtures.rb') +require File.join(File.dirname(__FILE__), '../../spec/blueprints.rb') features/support/env.rb @@ -13,13 +13,13 @@ end Cucumber::Rake::Task.new(:features, &cucumber_options) Cucumber::Rake::FeatureTask.new(:feature, &cucumber_options) namespace :merb_cucumber do - task :test_env do - Merb.start_environment(:environment => "test", :adapter => 'runner') + task :env do + Merb.start_environment(:environment => "cucumber", :adapter => 'runner') end end -dependencies = ['merb_cucumber:test_env', 'db:automigrate'] +dependencies = ['merb_cucumber:env', 'db:drop'] task :features => dependencies task :feature => dependencies lib/tasks/cucumber.rake @@ -124,7 +124,6 @@ describe Ticket do @t = Ticket.make(:project => Project.first || make_project, :tag_list => TAG_LIST, :user_creator => Project.first.project_members.first.user) - @old_title = @t.title @old_description = @t.description @t.generate_update(@t.attributes.merge(ticket), Project.first.project_members.first.user) spec/models/ticket_spec.rb ade7a3a21465556adbec66e8e86adce6f9e8cf53 Cyril Mougel cyril.mougel@gmail.com http://github.com/shingara/oupsnow/commit/5b558f920f1d554c895f30b9f83be8e8c020840b 5b558f920f1d554c895f30b9f83be8e8c020840b 2009-09-15T12:04:50-07:00 2009-09-15T12:04:50-07:00 start reuse cucumber with a drop_database on each scenario 47bcf342fb862613a8c84d4865c6cbd64b7c51d9 Cyril Mougel cyril.mougel@gmail.com