diff options
| author | Michel Etienne | 2012-10-15 09:31:39 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-10-15 09:31:39 +0200 |
| commit | af7100393e466c9ea24d2e0efd22645d8b09b920 (patch) | |
| tree | 39eacd9a50def34ac9d45b2cf9d79e56558309b2 | |
| parent | 9f839a932d2d58820a636bd601e20faf01fd8555 (diff) | |
| parent | 2bde64bde90f37bce9c5aba39575386eb56f1e60 (diff) | |
| download | chouette-core-af7100393e466c9ea24d2e0efd22645d8b09b920.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
| -rw-r--r-- | app/views/time_tables/show.html.erb | 4 | ||||
| -rw-r--r-- | spec/views/time_tables/show.html.erb_spec.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb index 45763fad5..d5034c6b2 100644 --- a/app/views/time_tables/show.html.erb +++ b/app/views/time_tables/show.html.erb @@ -64,9 +64,9 @@ </p> <div class="year_choice"> - <span class="previous"> <%= link_to("<", :year => (@year - 1) ) %> </span> + <span class="previous"> <%= link_to("<", referential_time_table_path(@referential, @time_table, :year => (@year - 1)) ) %> </span> <span class="year"> <%= "#{@year}" %> </span> - <span class="next"> <%= link_to(">", :year => (@year + 1) ) %> </span> + <span class="next"> <%= link_to(">", referential_time_table_path(@referential, @time_table, :year => (@year + 1)) ) %> </span> </div> <div class="calendar_helper"> <%= cal = "" diff --git a/spec/views/time_tables/show.html.erb_spec.rb b/spec/views/time_tables/show.html.erb_spec.rb index 17449748b..9d0527c5d 100644 --- a/spec/views/time_tables/show.html.erb_spec.rb +++ b/spec/views/time_tables/show.html.erb_spec.rb @@ -4,8 +4,9 @@ describe "/time_tables/show" do assign_referential let!(:time_table) { assign(:time_table, create(:time_table)) } + let!(:year) { assign(:year, Date.today.cwyear) } - it "should render h2 with the time_table comment" do + it "should render h2 with the time_table comment" do render rendered.should have_selector("h2", :text => Regexp.new(time_table.comment)) end |