Download as
Browse Code »

Commit b61b63ccbc30516896d709cfddb70e4e6cbd058e

Authored by Rafael Manzo
Committed by Diego Camarinha
1 parent bd6de12b

Revert "[Colab] Fixes for failling tests after adding the subdirectory to routes" 

This reverts commit 4211de4d7a8af53111995500e4d7c225023e143c.

The right way to set the subdirectory is by setting the Rack mount on config.ru
or on the webserver like apache or nginx.
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
features/step_definitions/reading_steps.rb
  Diff comments   View file @b61b63c
@@ -31,6 +31,6 @@ Then(/^I should see a color picker Canvas$/) do @@ -31,6 +31,6 @@ Then(/^I should see a color picker Canvas$/) do
31 end 31 end
32 32
33 When(/^I choose the destroy reading link$/) do 33 When(/^I choose the destroy reading link$/) do
34 - url = reading_group_reading_path(reading_group_id: @reading_group.id, id: @reading.id, locale: :en, subdirectory: 'mezuro') 34 + url = reading_group_reading_path(reading_group_id: @reading_group.id, id: @reading.id, locale: :en)
35 find("//a[@href='#{url}']").click 35 find("//a[@href='#{url}']").click
36 end 36 end
spec/routing/home_routing_spec.rb
  Diff comments   View file @b61b63c
@@ -2,8 +2,8 @@ require "rails_helper" @@ -2,8 +2,8 @@ require "rails_helper"
2 2
3 describe HomeController, :type => :routing do 3 describe HomeController, :type => :routing do
4 describe "routing" do 4 describe "routing" do
5 - it { is_expected.to route(:get, '/mezuro').  
6 - to(controller: :home, action: :index, subdirectory: 'mezuro') } 5 + it { is_expected.to route(:get, '/').
  6 + to(controller: :home, action: :index) }
7 it { is_expected.to route(:get, '/pt'). 7 it { is_expected.to route(:get, '/pt').
8 to(controller: :home, action: :index, locale: 'pt') } 8 to(controller: :home, action: :index, locale: 'pt') }
9 end 9 end