@@ -1,13 +1,5 @@ module IterationsHelper def display_stories_list_for_iteration(iteration) - if iteration.show? - render :partial => 'stories/list', :locals => { :stories => iteration.stories } - else - link_to_remote "show iteration", - :url => stories_iteration_path(iteration.project.id, iteration.id), - :method => :get, - :loading => "Element.update('notice', 'Loading #{iteration.name}...') ; Element.show('notice')", - :success => "Element.hide('notice')" - end + render :partial => 'stories/list', :locals => { :stories => iteration.stories } end end app/helpers/iterations_helper.rb @@ -1,7 +1,6 @@ <ul id="subnav"> <li><%= link_to "<em>o</em>verview", project, :accesskey => "o" %></li> <li><%= link_to "<em>w</em>orkspace", workspace_project_path(project), :accesskey => "w" %></li> - <li><%= link_to "<em>i</em>terations", iterations_path(project), :accesskey => "i" %></li> <li><%= link_to "<em>s</em>tories", stories_path(project), :accesskey => "s" %></li> <li><%= link_to "<em>p</em>hases", project_phases_path(project), :accesskey => "p" %></li> <li><%= link_to "invite people", new_project_invitation_path(project) %></li> app/views/projects/_navigation.html.erb @@ -3,9 +3,6 @@ <h2><%= project.name %>: summary</h2> <%= render :partial => "projects/summary", :locals => { :project => project } %> - <h2><%= project.name %>: iterations</h2> - <%= render :partial => "projects/iterations_sidebar", :locals => { :project => project } %> - <h2><%= project.name %>: people</h2> <%= render :partial => "projects/people_sidebar", :locals => { :project => project } %> <% end -%> app/views/projects/_sidebar.html.erb @@ -12,8 +12,6 @@ ActionController::Routing::Routes.draw do |map| map.resources :projects, :member => { :workspace => :get } do |project_map| project_map.resources :phases project_map.resources :invitations - project_map.resources :iterations, :name_prefix => nil, - :member => { :stories => :get } project_map.resources :stories, :name_prefix => nil, :collection => { :reorder => :put }, :member => { :update_points => :put, :update_status => :put, config/routes.rb @@ -1,33 +1,10 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe IterationsHelper, "#display_stories_list_for_iteration given an iteration that is not to be shown" do - it "returns a remote link to the stories_iteration_path" do - @iteration = mock "iteration" - @project = mock "project" - - @iteration.should_receive(:show?).and_return(false) - @iteration.should_receive(:project).and_return(@project) - @project.stub!(:id).and_return(1) - @iteration.stub!(:id).and_return(2) - @iteration.stub!(:name).and_return("Iteration 1") - self.should_receive(:link_to_remote).with( - "show iteration", - :url => stories_iteration_path(@project.id, @iteration.id), - :method => :get, - :loading => "Element.update('notice', 'Loading #{@iteration.name}...') ; Element.show('notice')", - :success => "Element.hide('notice')" - ).and_return("REMOTE LINK") - - display_stories_list_for_iteration(@iteration).should == "REMOTE LINK" - end -end - -describe IterationsHelper, "#display_stories_list_for_iteration given an iteration that is be shown" do +describe IterationsHelper, "#display_stories_list_for_iteration given an iteration" do it "returns the rendered stories/list partial" do @iteration = mock "iteration" @stories = mock "stories" - @iteration.should_receive(:show?).and_return(true) @iteration.should_receive(:stories).and_return(@stories) self.should_receive(:render).with( :partial => 'stories/list', spec/helpers/iterations_helper_spec.rb @@ -3,357 +3,357 @@ module Spec::Example::ExampleGroupMethods alias_method :is, :it end -# module Spec::Example::ExampleGroupMethods -# def it_delegates(*args) -# options = args.extract_options! -# methods = args -# src = options[:on] -# to = options[:to] -# raise "Missing an object to call the method on, pass in :on" unless src -# raise "Missing an object to ensure the method delegated to, pass in :to" unless to -# -# method_options = options.reject{|k,v| [:on, :to].include?(k)} -# methods.each {|m| method_options[m] = m} -# method_options.each do |source_method, to_method| -# it "delegates ##{source_method} to @#{to}.#{to_method}" do -# obj = instance_variable_get "@#{to}" -# _src = instance_variable_get "@#{src}" -# return_val = stub("return val") -# obj.should_receive(to_method).and_return(return_val) -# _src.send!(source_method).should == return_val -# end -# end -# end -# -# def it_provides_liquid_methods(*methods) -# it "defines ##{self.described_type}::LiquidDrop (declare liquid_methods to do this automatically)" do -# self.class.described_type.const_defined?(:LiquidDrop).should be_true -# end -# -# if self.described_type.const_defined?(:LiquidDrop) -# klass = self.described_type::LiquidDrop -# describe klass do -# before do -# @presenter = stub("presenter") -# @drop = klass.new(@presenter) -# end -# methods.each do |method| -# it "provides ##{method} to liquid" do -# return_value = stub("return value") -# @presenter.should_receive(method).and_return(return_value) -# @drop.send(method).should == return_value -# end -# end -# end -# end -# end -# -# def it_has_accessors(attribute, options) -# on_variable_name = options[:on] -# raise "Missing an object to call the method on, pass in :on" unless on_variable_name -# -# it "has accessors for ##{attribute}" do -# on = instance_variable_get "@#{on_variable_name}" -# on.send("#{attribute}=", :the_value) -# on.send(attribute).should == :the_value -# end -# -# if options.keys.include?(:default) -# it "defaults ##{attribute} to #{options[:default].inspect}" do -# on = instance_variable_get "@#{on_variable_name}" -# on.send(attribute).should == options[:default] -# end -# end -# end -# alias_method :it_has_accessor, :it_has_accessors -# -# end -# -# class Spec::Rails::Example::ViewExampleGroup -# def self.it_renders_a_link_to_unless_current(named_route) -# describe "when #{named_route} is the current page" do -# it "does not render a link to the #{named_route} page" do -# render_it -# response.should have_tag("a[href=?]", send(named_route)) -# end -# end -# -# describe "when #{named_route} is not the current page" do -# it "renders a link to the #{named_route}" do -# template.stub!(:current_page?).and_return(true) -# render_it -# response.should_not have_tag("a[href=?]", send(named_route)) -# end -# end -# end -# -# -# def self.it_renders_javascript_tags_for(*jsfiles) -# if jsfiles.include?(:defaults) -# jsfiles.delete(:defaults) -# jsfiles += [:prototype, :effects, :dragdrop, :controls] -# end -# jsfiles.each do |jsfile| -# it "renders a javascript tag for #{jsfile}.js" do -# render_it -# response.should have_tag('script[src*=?][type=text/javascript]', "#{jsfile}.js") -# end -# end -# end -# -# def self.it_renders_stylesheet_link_tags_for(*cssfiles) -# options = cssfiles.extract_options! -# media = options[:media] || "screen" -# cssfiles.each do |cssfile| -# it "renders a link tag for #{cssfile}.css" do -# render_it -# response.should have_tag('link[href*=?][media=?][rel=stylesheet][type=text/css]', "#{cssfile}.css", media) -# end -# end -# end -# -# def self.it_does_not_render_stylesheet_link_tags_for(*cssfiles) -# cssfiles.each do |cssfile| -# it "does not render a link tag for #{cssfile}.css" do -# render_it -# response.should_not have_tag('link[href*=?][rel=stylesheet][type=text/css]', "#{cssfile}.css") -# end -# end -# end -# -# def self.it_renders_error_messages_for(*models) -# models.each do |model| -# it "renders error messages for #{model}" do -# instance = instance_variable_get "@#{model}" -# errors = stub("Errors", :count => 1, :full_messages => ["attribute1 error1"]) -# instance.stub!(:errors).and_return(errors) -# render_it -# response.should have_tag("#errorExplanation", "attribute1 error1".to_regexp) -# end -# end -# end -# end -# -# module Spec::Example::ExampleGroupMethods -# def model_class -# self.described_type -# end -# -# def it_requires attribute -# it "requires #{attribute}" do -# model = self.class.model_class.new -# assert_validates_presence_of model, attribute -# end -# end -# -# def it_protects attribute -# it "protects #{attribute} from mass assignment" do -# default_value = self.class.model_class.new[attribute] -# model = self.class.model_class.new(attribute => !default_value) -# model[attribute].should == default_value -# end -# end -# -# def it_validates_uniqueness_of attribute, options -# it "validates the uniqueness of #{attribute}" do -# model = self.class.model_class.new -# if options[:values] -# options[:values].each_pair do |attribute, value| -# model[attribute] = value -# end -# else -# model[attribute] = options[:value] -# end -# assert_attribute_invalid model, attribute -# end -# -# if options[:allow_nil] -# it "doesn't enforce uniqueness on #{attribute} when it is nil" do -# assert self.class.model_class.count(:conditions => {attribute => nil}) > 0, "must have a record where #{attribute} is nil to check this validation" -# model = self.class.model_class.new -# model[attribute] = nil -# assert_attribute_valid model, attribute -# end -# else -# it "enforces uniqueness on #{attribute} when it is nil" do -# model = self.class.model_class.new -# model[attribute] = nil -# assert_attribute_invalid model, attribute -# end -# end -# end -# -# def it_validates_inclusion_of attribute, options -# options[:exclusions].each do |exclusion| -# it "does not allow #{attribute} to have a value of #{exclusion.inspect}" do -# model = self.class.model_class.new -# model[attribute] = exclusion -# assert_attribute_invalid(model, attribute) -# end -# end -# options[:inclusions].each do |inclusion| -# it "allows #{attribute} to have a value of #{inclusion.inspect}" do -# model = self.class.model_class.new -# model[attribute] = inclusion -# assert_attribute_valid(model, attribute) -# end -# end -# end -# -# def it_has_one association, options={} -# it "has one #{association}" do -# self.class.model_class.should have_association(:has_one, association.to_sym, options) -# end -# end -# -# -# def it_has_many association, options={} -# it "has many #{association}" do -# self.class.model_class.should have_association(:has_many, association.to_sym, options) -# end -# end -# -# def it_belongs_to association, options={} -# a_or_an = association.to_s =~ /^[aeiou]/i ? "an" : "a" -# it "belongs to #{a_or_an} #{association}" do -# self.class.model_class.should have_association(:belongs_to, association.to_sym, options) -# end -# end -# -# end -# -# class Spec::Rails::Example::ControllerExampleGroup -# def self.controller_class -# self.described_type -# end -# -# class << self -# def it_hides_the_actions(*actions) -# actions.each do |action| -# it "hides the action ##{action}" do -# controller.class.hidden_actions.should include(action.to_s) -# end -# end -# end -# alias_method :it_hides_the_action, :it_hides_the_actions -# end -# -# def self.it_does_not_require_login(method, action) -# it_skips_before_filter(:login_required, action) -# end -# -# def self.it_skips_before_filter(filter, action) -# describe controller_class, "##{action}" do -# it "skips the '#{filter}' before filter" do -# filter_not_present_or_exluded(filter, action).should be_true -# end -# -# def filter_not_present_or_exluded(filter, action) -# filter = controller.class.find_filter(filter) -# if filter -# controller.class.filter_excluded_from_action?(filter, action.to_s) -# else -# true -# end -# end -# end -# end -# -# def self.it_requires_login(method, action, params={}) -# describe controller_class, "#{method} ##{action} requires login" do -# before do -# stub_before_filters! :except => :login_required -# end -# -# describe controller_class, "when not logged in" do -# it "redirects to signup" do -# send method, action, params -# response.should redirect_to(signup_path) -# end -# -# it "does not call the action" do -# controller.should_not_receive(action) -# send method, action, params -# end -# end -# -# describe controller_class, "when logged in" do -# before do -# login_with_user -# end -# -# it "calls the action" do -# controller.should_receive(action) -# send method, action, params -# end -# end -# end -# end -# -# def self.it_requires_a_superuser(method, action, params={}) -# describe controller_class, "#{method} ##{action} requires a superuser to be logged in" do -# before do -# stub_before_filters! :except => :superuser_required -# end -# -# describe controller_class, "when a user is not logged in" do -# it "redirects the user to the signup page" do -# send method, action, params -# response.should redirect_to(signup_path) -# end -# -# it "sets an error message telling them that they need to log in or sign up" do -# send method, action, params -# flash[:error].should == "You need to sign up or log in before you can do that." -# end -# end -# -# describe controller_class, "when a user is logged in but is not a superuser" do -# before do -# login_with_user -# end -# -# it "sets an error message telling the user they don't have access" do -# send method, action, params -# flash[:error].should =~ /You don't have access to/i -# end -# -# describe controller_class, "when a user came from a referring page" do -# before do -# @referer = "http://www.google.com" -# request.headers["HTTP_REFERER"] = @referer -# end -# -# it "redirects the user :back to the referring page" do -# send method, action, params -# response.should redirect_to(@referer) -# end -# end -# -# describe controller_class, "when a user did not come from a referring page" do -# before do -# request.headers["HTTP_REFERER"] = nil -# end -# -# it "redirects the user to their home page" do -# send method, action, params -# response.should redirect_to(home_path) -# end -# end -# end -# -# describe controller_class, "when a superuser is logged in" do -# before do -# user = login_with_user -# user.stub!(:superuser?).and_return(true) -# end -# -# it "calls the action" do -# controller.should_receive(action) -# send method, action, params -# end -# end -# -# end -# end -# end +module Spec::Example::ExampleGroupMethods + def it_delegates(*args) + options = args.extract_options! + methods = args + src = options[:on] + to = options[:to] + raise "Missing an object to call the method on, pass in :on" unless src + raise "Missing an object to ensure the method delegated to, pass in :to" unless to + + method_options = options.reject{|k,v| [:on, :to].include?(k)} + methods.each {|m| method_options[m] = m} + method_options.each do |source_method, to_method| + it "delegates ##{source_method} to @#{to}.#{to_method}" do + obj = instance_variable_get "@#{to}" + _src = instance_variable_get "@#{src}" + return_val = stub("return val") + obj.should_receive(to_method).and_return(return_val) + _src.send!(source_method).should == return_val + end + end + end + + def it_provides_liquid_methods(*methods) + it "defines ##{self.described_type}::LiquidDrop (declare liquid_methods to do this automatically)" do + self.class.described_type.const_defined?(:LiquidDrop).should be_true + end + + if self.described_type.const_defined?(:LiquidDrop) + klass = self.described_type::LiquidDrop + describe klass do + before do + @presenter = stub("presenter") + @drop = klass.new(@presenter) + end + methods.each do |method| + it "provides ##{method} to liquid" do + return_value = stub("return value") + @presenter.should_receive(method).and_return(return_value) + @drop.send(method).should == return_value + end + end + end + end + end + + def it_has_accessors(attribute, options) + on_variable_name = options[:on] + raise "Missing an object to call the method on, pass in :on" unless on_variable_name + + it "has accessors for ##{attribute}" do + on = instance_variable_get "@#{on_variable_name}" + on.send("#{attribute}=", :the_value) + on.send(attribute).should == :the_value + end + + if options.keys.include?(:default) + it "defaults ##{attribute} to #{options[:default].inspect}" do + on = instance_variable_get "@#{on_variable_name}" + on.send(attribute).should == options[:default] + end + end + end + alias_method :it_has_accessor, :it_has_accessors + +end + +class Spec::Rails::Example::ViewExampleGroup + def self.it_renders_a_link_to_unless_current(named_route) + describe "when #{named_route} is the current page" do + it "does not render a link to the #{named_route} page" do + render_it + response.should have_tag("a[href=?]", send(named_route)) + end + end + + describe "when #{named_route} is not the current page" do + it "renders a link to the #{named_route}" do + template.stub!(:current_page?).and_return(true) + render_it + response.should_not have_tag("a[href=?]", send(named_route)) + end + end + end + + + def self.it_renders_javascript_tags_for(*jsfiles) + if jsfiles.include?(:defaults) + jsfiles.delete(:defaults) + jsfiles += [:prototype, :effects, :dragdrop, :controls] + end + jsfiles.each do |jsfile| + it "renders a javascript tag for #{jsfile}.js" do + render_it + response.should have_tag('script[src*=?][type=text/javascript]', "#{jsfile}.js") + end + end + end + + def self.it_renders_stylesheet_link_tags_for(*cssfiles) + options = cssfiles.extract_options! + media = options[:media] || "screen" + cssfiles.each do |cssfile| + it "renders a link tag for #{cssfile}.css" do + render_it + response.should have_tag('link[href*=?][media=?][rel=stylesheet][type=text/css]', "#{cssfile}.css", media) + end + end + end + + def self.it_does_not_render_stylesheet_link_tags_for(*cssfiles) + cssfiles.each do |cssfile| + it "does not render a link tag for #{cssfile}.css" do + render_it + response.should_not have_tag('link[href*=?][rel=stylesheet][type=text/css]', "#{cssfile}.css") + end + end + end + + def self.it_renders_error_messages_for(*models) + models.each do |model| + it "renders error messages for #{model}" do + instance = instance_variable_get "@#{model}" + errors = stub("Errors", :count => 1, :full_messages => ["attribute1 error1"]) + instance.stub!(:errors).and_return(errors) + render_it + response.should have_tag("#errorExplanation", "attribute1 error1".to_regexp) + end + end + end +end + +module Spec::Example::ExampleGroupMethods + def model_class + self.described_type + end + + def it_requires attribute + it "requires #{attribute}" do + model = self.class.model_class.new + assert_validates_presence_of model, attribute + end + end + + def it_protects attribute + it "protects #{attribute} from mass assignment" do + default_value = self.class.model_class.new[attribute] + model = self.class.model_class.new(attribute => !default_value) + model[attribute].should == default_value + end + end + + def it_validates_uniqueness_of attribute, options + it "validates the uniqueness of #{attribute}" do + model = self.class.model_class.new + if options[:values] + options[:values].each_pair do |attribute, value| + model[attribute] = value + end + else + model[attribute] = options[:value] + end + assert_attribute_invalid model, attribute + end + + if options[:allow_nil] + it "doesn't enforce uniqueness on #{attribute} when it is nil" do + assert self.class.model_class.count(:conditions => {attribute => nil}) > 0, "must have a record where #{attribute} is nil to check this validation" + model = self.class.model_class.new + model[attribute] = nil + assert_attribute_valid model, attribute + end + else + it "enforces uniqueness on #{attribute} when it is nil" do + model = self.class.model_class.new + model[attribute] = nil + assert_attribute_invalid model, attribute + end + end + end + + def it_validates_inclusion_of attribute, options + options[:exclusions].each do |exclusion| + it "does not allow #{attribute} to have a value of #{exclusion.inspect}" do + model = self.class.model_class.new + model[attribute] = exclusion + assert_attribute_invalid(model, attribute) + end + end + options[:inclusions].each do |inclusion| + it "allows #{attribute} to have a value of #{inclusion.inspect}" do + model = self.class.model_class.new + model[attribute] = inclusion + assert_attribute_valid(model, attribute) + end + end + end + + def it_has_one association, options={} + it "has one #{association}" do + self.class.model_class.should have_association(:has_one, association.to_sym, options) + end + end + + + def it_has_many association, options={} + it "has many #{association}" do + self.class.model_class.should have_association(:has_many, association.to_sym, options) + end + end + + def it_belongs_to association, options={} + a_or_an = association.to_s =~ /^[aeiou]/i ? "an" : "a" + it "belongs to #{a_or_an} #{association}" do + self.class.model_class.should have_association(:belongs_to, association.to_sym, options) + end + end + +end + +class Spec::Rails::Example::ControllerExampleGroup + def self.controller_class + self.described_type + end + + class << self + def it_hides_the_actions(*actions) + actions.each do |action| + it "hides the action ##{action}" do + controller.class.hidden_actions.should include(action.to_s) + end + end + end + alias_method :it_hides_the_action, :it_hides_the_actions + end + + def self.it_does_not_require_login(method, action) + it_skips_before_filter(:login_required, action) + end + + def self.it_skips_before_filter(filter, action) + describe controller_class, "##{action}" do + it "skips the '#{filter}' before filter" do + filter_not_present_or_exluded(filter, action).should be_true + end + + def filter_not_present_or_exluded(filter, action) + filter = controller.class.find_filter(filter) + if filter + controller.class.filter_excluded_from_action?(filter, action.to_s) + else + true + end + end + end + end + + def self.it_requires_login(method, action, params={}) + describe controller_class, "#{method} ##{action} requires login" do + before do + stub_before_filters! :except => :login_required + end + + describe controller_class, "when not logged in" do + it "redirects to signup" do + send method, action, params + response.should redirect_to(signup_path) + end + + it "does not call the action" do + controller.should_not_receive(action) + send method, action, params + end + end + + describe controller_class, "when logged in" do + before do + login_with_user + end + + it "calls the action" do + controller.should_receive(action) + send method, action, params + end + end + end + end + + def self.it_requires_a_superuser(method, action, params={}) + describe controller_class, "#{method} ##{action} requires a superuser to be logged in" do + before do + stub_before_filters! :except => :superuser_required + end + + describe controller_class, "when a user is not logged in" do + it "redirects the user to the signup page" do + send method, action, params + response.should redirect_to(signup_path) + end + + it "sets an error message telling them that they need to log in or sign up" do + send method, action, params + flash[:error].should == "You need to sign up or log in before you can do that." + end + end + + describe controller_class, "when a user is logged in but is not a superuser" do + before do + login_with_user + end + + it "sets an error message telling the user they don't have access" do + send method, action, params + flash[:error].should =~ /You don't have access to/i + end + + describe controller_class, "when a user came from a referring page" do + before do + @referer = "http://www.google.com" + request.headers["HTTP_REFERER"] = @referer + end + + it "redirects the user :back to the referring page" do + send method, action, params + response.should redirect_to(@referer) + end + end + + describe controller_class, "when a user did not come from a referring page" do + before do + request.headers["HTTP_REFERER"] = nil + end + + it "redirects the user to their home page" do + send method, action, params + response.should redirect_to(home_path) + end + end + end + + describe controller_class, "when a superuser is logged in" do + before do + user = login_with_user + user.stub!(:superuser?).and_return(true) + end + + it "calls the action" do + controller.should_receive(action) + send method, action, params + end + end + + end + end +end spec/spec_helpers/it_helpers.rb @@ -15,10 +15,6 @@ describe "/projects/_navigation.html.erb" do response.should have_tag("a[href=?]", workspace_project_path(@project)) end - it "displays a link to the project's iterations" do - response.should have_tag("a[href=?]", iterations_path(@project)) - end - it "displays a link to the project's stories" do response.should have_tag("a[href=?]", stories_path(@project)) end spec/views/projects/_navigation.html.erb_spec.rb app/controllers/iterations_controller.rb app/views/iterations/current.html.erb app/views/iterations/edit.html.erb app/views/iterations/index.html.erb app/views/iterations/new.html.erb app/views/iterations/show.html.erb app/views/iterations/stories.js.rjs app/views/projects/_iterations_sidebar.html.erb spec/controllers/iterations_controller_spec.rb spec/views/iterations/stories.js.rjs_spec.rb 40f160204ec35a8f7d393daa774fe43f94873be8 Zach Dennis zach.dennis@gmail.com http://github.com/zdennis/strac/commit/47a9ea1a66cb9f734af63be87e1b7a9d2ef31c6a 47a9ea1a66cb9f734af63be87e1b7a9d2ef31c6a 2008-03-02T22:14:40-08:00 2008-03-02T22:14:40-08:00 Removed the IterationsController. * removed most of the iterations view templates, but left a couple which were being used by the stories tag based view * left the iterations helper, but dumbed it down until it can be removed * uncommented some spec it_helpers df11ae0f815f73cf31bf5fe1fc0f7b0c60a1d130 Zach Dennis zach.dennis@gmail.com