From fd1d1b353ac1a476985ed67fae3cece636d84151 Mon Sep 17 00:00:00 2001
From: Rafael Reggiani Manzo <rr.manzo@gmail.com>
Date: Tue, 24 Mar 2015 13:35:29 -0300
Subject: [PATCH] Language can be set by the route

---
 app/controllers/application_controller.rb                          | 15 ++++++++++++---
 app/controllers/concerns/ownership_authentication.rb               |  4 ++--
 app/views/layouts/application.html.erb                             | 23 ++++++++++++++++++++++-
 config/routes.rb                                                   | 68 ++++++++++++++++++++++++++++++++++++--------------------------------
 features/compound_metric_configuration/create.feature              |  1 +
 features/homepage.feature                                          |  9 ++++++++-
 features/step_definitions/compound_metric_configuration_steps.rb   |  4 ++--
 features/step_definitions/kalibro_configuration_steps.rb           |  6 +++---
 features/step_definitions/kalibro_range_steps.rb                   |  8 ++++----
 features/step_definitions/metric_configuration_steps.rb            |  8 ++++----
 features/step_definitions/project_steps.rb                         |  6 +++---
 features/step_definitions/reading_group_steps.rb                   |  8 ++++----
 features/step_definitions/reading_steps.rb                         |  6 +++---
 features/step_definitions/repository_steps.rb                      |  6 +++---
 spec/controllers/base_metric_configurations_controller_spec.rb     |  2 +-
 spec/controllers/compound_metric_configurations_controller_spec.rb |  8 ++++----
 spec/controllers/home_controller_spec.rb                           |  4 ++++
 spec/controllers/kalibro_configurations_controller_spec.rb         | 10 +++++-----
 spec/controllers/kalibro_ranges_controller_spec.rb                 | 20 ++++++++++----------
 spec/controllers/metric_configurations_controller_spec.rb          | 12 ++++++------
 spec/controllers/repositories_controller_spec.rb                   |  2 +-
 spec/routing/home_routing_spec.rb                                  |  2 ++
 spec/routing/project_routing_spec.rb                               |  3 +++
 23 files changed, 143 insertions(+), 92 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d53225a..c5968d1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -19,9 +19,18 @@ class ApplicationController < ActionController::Base
   end
 
   def set_locale
-    compatible_locale = http_accept_language.compatible_language_from(I18n.available_locales)
-    unless compatible_locale.nil?
-      I18n.locale = compatible_locale
+    unless params[:locale].nil?
+      I18n.locale = params[:locale]
+    else
+      compatible_locale = http_accept_language.compatible_language_from(I18n.available_locales)
+      unless compatible_locale.nil?
+        I18n.locale = compatible_locale
+      end
     end
   end
+
+  # This happens after the *_url *_path helpers
+  def default_url_options(options = {})
+    { locale: I18n.locale == I18n.default_locale ? nil : I18n.locale }.merge options
+  end
 end
diff --git a/app/controllers/concerns/ownership_authentication.rb b/app/controllers/concerns/ownership_authentication.rb
index 9c8f897..cdb1db0 100644
--- a/app/controllers/concerns/ownership_authentication.rb
+++ b/app/controllers/concerns/ownership_authentication.rb
@@ -65,7 +65,7 @@ module OwnershipAuthentication
   def check_reading_group_ownership(id)
     if current_user.reading_group_ownerships.find_by_reading_group_id(id).nil?
       respond_to do |format|
-        format.html { redirect_to reading_group_url(id), notice: "You're not allowed to do this operation" }
+        format.html { redirect_to reading_group_url(id: id), notice: "You're not allowed to do this operation" }
         format.json { head :no_content }
       end
     end
@@ -76,7 +76,7 @@ module OwnershipAuthentication
   def check_kalibro_configuration_ownership(id)
     if current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id(id).nil?
       respond_to do |format|
-        format.html { redirect_to kalibro_configurations_url(id), notice: "You're not allowed to do this operation" }
+        format.html { redirect_to kalibro_configurations_url(id: id), notice: "You're not allowed to do this operation" }
         format.json { head :no_content }
       end
     end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 82737de..21b6dd2 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -63,7 +63,7 @@
               <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
               <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
             </ul>
-            <ul class="nav navbar-nav" style="float: right;">
+            <ul class="nav navbar-nav navbar-right">
               <% if user_signed_in? %>
                 <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
                 <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
@@ -71,6 +71,17 @@
                 <li><%= link_to t('sign_in'), new_user_session_path %></li>
                 <li><%= link_to t('sign_up'), new_user_registration_path %></li>
               <% end %>
+              <li class="dropdown">
+                <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
+                  Languages
+                  <span class="caret"></span>
+                </a>
+                <ul class="dropdown-menu" role="menu">
+                  <% I18n.available_locales.each do |locale| %>
+                    <li><a href="#"><%= locale.to_s %></a></li>
+                  <% end %>
+                </ul>
+              </li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
@@ -111,6 +122,16 @@
         <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
       </footer>
 
+      <script type="text/javascript">
+        $(function() {
+          $( "#languages-accordion > div" ).accordion({
+            heightStyle: "content",
+            collapsible: true,
+            active: false
+          });
+        });
+      </script>
+
     </div> <!-- /container -->
 
   </body>
diff --git a/config/routes.rb b/config/routes.rb
index acc6c6b..a4c7b16 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,43 +1,47 @@
 Rails.application.routes.draw do
-  devise_for :users
-  get 'users/:user_id/projects' => 'users#projects', as: :user_projects
-
-  resources :projects do
-    resources :repositories, except: [:update, :index]
-    get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module
-    post '/repositories/:id/state' => 'repositories#state', as: :repository_state
-    post '/repositories/:id/state_with_date' => 'repositories#state_with_date', as: :repository_state_with_date
-    put '/repositories/:id' => 'repositories#update', as: :repository_update
-    get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process
-  end
+  scope "(:locale)", locale: /en|pt/ do
+    devise_for :users
+    get 'users/:user_id/projects' => 'users#projects', as: :user_projects
+
+    resources :projects do
+      resources :repositories, except: [:update, :index]
+      get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module
+      post '/repositories/:id/state' => 'repositories#state', as: :repository_state
+      post '/repositories/:id/state_with_date' => 'repositories#state_with_date', as: :repository_state_with_date
+      put '/repositories/:id' => 'repositories#update', as: :repository_update
+      get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process
+    end
 
-  resources :kalibro_configurations do
-    get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric
-    resources :metric_configurations, except: [:update, :new] do
-      get '/kalibro_ranges/new' => 'kalibro_ranges#new', as: :new_kalibro_range
-      resources :kalibro_ranges, except: [:update, :new]
-      put '/kalibro_ranges/:id' => 'kalibro_ranges#update', as: :kalibro_range_update
+    resources :kalibro_configurations do
+      get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric
+      resources :metric_configurations, except: [:update, :new] do
+        get '/kalibro_ranges/new' => 'kalibro_ranges#new', as: :new_kalibro_range
+        resources :kalibro_ranges, except: [:update, :new]
+        put '/kalibro_ranges/:id' => 'kalibro_ranges#update', as: :kalibro_range_update
+      end
+      post '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration
+      put '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update
+
+      resources :compound_metric_configurations, except: [:destroy, :update]
+      put '/compound_metric_configurations/:id' => 'compound_metric_configurations#update', as: :compound_metric_configuration_update
     end
-    post '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration
-    put '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update
 
-    resources :compound_metric_configurations, except: [:destroy, :update]
-    put '/compound_metric_configurations/:id' => 'compound_metric_configurations#update', as: :compound_metric_configuration_update
-  end
+    resources :reading_groups do
+      resources :readings, except: [:index, :update, :show]
+      put '/readings/:id' => 'readings#update', as: :reading_update
+    end
 
-  resources :reading_groups do
-    resources :readings, except: [:index, :update, :show]
-    put '/readings/:id' => 'readings#update', as: :reading_update
-  end
+    #resources :modules
+    post '/modules/:id/metric_history' => 'modules#metric_history'
+    post '/modules/:id/tree' => 'modules#load_module_tree'
 
-  #resources :modules
-  post '/modules/:id/metric_history' => 'modules#metric_history'
-  post '/modules/:id/tree' => 'modules#load_module_tree'
+    # Tutorials
+    get '/tutorials/:name' => 'tutorials#view', as: 'tutorials'
 
-  # Tutorials
-  get '/tutorials/:name' => 'tutorials#view', as: 'tutorials'
+    root "home#index"
+  end
 
-  root "home#index"
+  get '/:locale' => 'home#index'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
diff --git a/features/compound_metric_configuration/create.feature b/features/compound_metric_configuration/create.feature
index d1fde0f..fa3fdc8 100644
--- a/features/compound_metric_configuration/create.feature
+++ b/features/compound_metric_configuration/create.feature
@@ -38,6 +38,7 @@ Feature: Compound Metric Configuration Creation
     And I have another compound metric configuration with code "Another_Code" within the given mezuro configuration
     And I am at the Sample Configuration page
     And I click the Add Metric link
+    And I take a picture of the page
     And I click the Compound Metric link
     When I fill the Name field with "My Compound Metric"
     And I fill the Description field with "Some description"
diff --git a/features/homepage.feature b/features/homepage.feature
index f1dda5a..5b96ed3 100644
--- a/features/homepage.feature
+++ b/features/homepage.feature
@@ -18,4 +18,11 @@ Feature: Homepage
     And I should see "Sign Out"
     And I should see "Latest projects"
     And I should see "Project"
-    And I should see "Your projects"
\ No newline at end of file
+    And I should see "Your projects"
+
+  @wip
+  Scenario: Language selection
+    Given I am at the homepage
+    When I click the Languages link
+    And I click the pt link
+    Then I should see "Entendendo Métricas de Código"
\ No newline at end of file
diff --git a/features/step_definitions/compound_metric_configuration_steps.rb b/features/step_definitions/compound_metric_configuration_steps.rb
index 4012ffa..a37181c 100644
--- a/features/step_definitions/compound_metric_configuration_steps.rb
+++ b/features/step_definitions/compound_metric_configuration_steps.rb
@@ -15,7 +15,7 @@ Given(/^I have another compound metric configuration with code "(.*?)" within th
 end
 
 When(/^I visit the sample compound metric configuration edit page$/) do
-  visit edit_kalibro_configuration_compound_metric_configuration_path(@compound_metric_configuration.kalibro_configuration_id, @compound_metric_configuration.id)
+  visit edit_kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: @compound_metric_configuration.kalibro_configuration_id, id: @compound_metric_configuration.id)
 end
 
 When(/^I click the edit link of the Coumpound Metric$/) do
@@ -27,7 +27,7 @@ When(/^I click the show link of "(.*?)"$/) do |name|
 end
 
 When(/^I am at the sample compound metric configuration page$/) do
-  visit kalibro_configuration_compound_metric_configuration_path(@compound_metric_configuration.kalibro_configuration_id, @compound_metric_configuration.id)
+  visit kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: @compound_metric_configuration.kalibro_configuration_id, id: @compound_metric_configuration.id)
   expect(page).to have_content(@compound_metric_configuration.metric.name)
   expect(page).to have_content("Ranges")
 end
diff --git a/features/step_definitions/kalibro_configuration_steps.rb b/features/step_definitions/kalibro_configuration_steps.rb
index 0f897a6..ea1717c 100644
--- a/features/step_definitions/kalibro_configuration_steps.rb
+++ b/features/step_definitions/kalibro_configuration_steps.rb
@@ -20,11 +20,11 @@ Given(/^I own a sample configuration$/) do
 end
 
 Given(/^I am at the Sample Configuration page$/) do
-  visit kalibro_configuration_path(@kalibro_configuration.id)
+  visit kalibro_configuration_path(id: @kalibro_configuration.id)
 end
 
 Given(/^I am at the sample configuration edit page$/) do
-  visit edit_kalibro_configuration_path(@kalibro_configuration.id)
+  visit edit_kalibro_configuration_path(id: @kalibro_configuration.id)
 end
 
 Given(/^I own a configuration named "(.*?)"$/) do |name|
@@ -33,7 +33,7 @@ Given(/^I own a configuration named "(.*?)"$/) do |name|
 end
 
 When(/^I visit the sample configuration edit page$/) do
-  visit edit_kalibro_configuration_path(@kalibro_configuration.id)
+  visit edit_kalibro_configuration_path(id: @kalibro_configuration.id)
 end
 
 Then(/^I should be in the Edit Configuration page$/) do
diff --git a/features/step_definitions/kalibro_range_steps.rb b/features/step_definitions/kalibro_range_steps.rb
index d359766..067d97b 100644
--- a/features/step_definitions/kalibro_range_steps.rb
+++ b/features/step_definitions/kalibro_range_steps.rb
@@ -9,11 +9,11 @@ Given(/^I have a sample range within the sample compound metric configuration wi
 end
 
 Given(/^I am at the Edit Kalibro Range page$/) do
-  visit edit_kalibro_configuration_metric_configuration_kalibro_range_path(@metric_configuration.kalibro_configuration_id, @metric_configuration.id, @kalibro_range.id)
+  visit edit_kalibro_configuration_metric_configuration_kalibro_range_path(kalibro_configuration_id: @metric_configuration.kalibro_configuration_id, metric_configuration_id: @metric_configuration.id, id: @kalibro_range.id)
 end
 
 Given(/^I am at the Edit Kalibro Range page for the compound metric configuration$/) do
-  visit edit_kalibro_configuration_metric_configuration_kalibro_range_path(@compound_metric_configuration.kalibro_configuration_id, @compound_metric_configuration.id, @kalibro_range.id)
+  visit edit_kalibro_configuration_metric_configuration_kalibro_range_path(kalibro_configuration_id: @compound_metric_configuration.kalibro_configuration_id, metric_configuration_id: @compound_metric_configuration.id, id: @kalibro_range.id)
 end
 
 Given(/^the select field "(.*?)" is set as "(.*?)"$/) do |field, text|
@@ -31,11 +31,11 @@ Given(/^I have a sample range within the sample compound metric configuration$/)
 end
 
 When(/^I am at the New Range page$/) do
-  visit kalibro_configuration_metric_configuration_new_kalibro_range_path(@metric_configuration.kalibro_configuration_id, @metric_configuration.id)
+  visit kalibro_configuration_metric_configuration_new_kalibro_range_path(kalibro_configuration_id: @metric_configuration.kalibro_configuration_id, metric_configuration_id: @metric_configuration.id)
 end
 
 Given(/^I am at the New Range page for the compound metric configuration$/) do
-  visit kalibro_configuration_metric_configuration_new_kalibro_range_path(@compound_metric_configuration.kalibro_configuration_id, @compound_metric_configuration.id)
+  visit kalibro_configuration_metric_configuration_new_kalibro_range_path(kalibro_configuration_id: @compound_metric_configuration.kalibro_configuration_id, metric_configuration_id: @compound_metric_configuration.id)
 end
 
 
diff --git a/features/step_definitions/metric_configuration_steps.rb b/features/step_definitions/metric_configuration_steps.rb
index f884285..cf7e4ef 100644
--- a/features/step_definitions/metric_configuration_steps.rb
+++ b/features/step_definitions/metric_configuration_steps.rb
@@ -20,19 +20,19 @@ Given(/^I have a sample configuration with MetricFu metrics$/) do
 end
 
 When(/^I visit the sample metric configuration edit page$/) do
-  visit edit_kalibro_configuration_metric_configuration_path(@metric_configuration.kalibro_configuration_id, @metric_configuration.id)
+  visit edit_kalibro_configuration_metric_configuration_path(kalibro_configuration_id: @metric_configuration.kalibro_configuration_id, id: @metric_configuration.id)
 end
 
 When(/^I visit the sample metric configuration page$/) do
-  visit kalibro_configuration_metric_configuration_path(@metric_configuration.kalibro_configuration_id, @metric_configuration.id)
+  visit kalibro_configuration_metric_configuration_path(kalibro_configuration_id: @metric_configuration.kalibro_configuration_id, id: @metric_configuration.id)
 end
 
 When(/^I visit the sample metric configuration page$/) do
-  visit edit_kalibro_configuration_path(@kalibro_configuration.id)
+  visit edit_kalibro_configuration_path(id: @kalibro_configuration.id)
 end
 
 Then(/^I am at the sample metric configuration page$/) do
-  visit kalibro_configuration_metric_configuration_path(@metric_configuration.kalibro_configuration_id, @metric_configuration.id)
+  visit kalibro_configuration_metric_configuration_path(kalibro_configuration_id: @metric_configuration.kalibro_configuration_id, id: @metric_configuration.id)
   expect(page).to have_content(@metric_configuration.metric.name)
   expect(page).to have_content("Ranges")
 end
diff --git a/features/step_definitions/project_steps.rb b/features/step_definitions/project_steps.rb
index 65b17c3..4e390e4 100644
--- a/features/step_definitions/project_steps.rb
+++ b/features/step_definitions/project_steps.rb
@@ -27,15 +27,15 @@ Given(/^I own a project named "(.*?)"$/) do |name|
 end
 
 Given(/^I am at the Sample Project page$/) do
-  visit project_path(@project.id)
+  visit project_path(id: @project.id)
 end
 
 Given(/^I am at the sample project edit page$/) do
-  visit edit_project_path(@project.id)
+  visit edit_project_path(id: @project.id)
 end
 
 Given(/^I visit the sample project edit page$/) do
-  visit edit_project_path(@project.id)
+  visit edit_project_path(id: @project.id)
 end
 
 Given(/^I am at the New Project page$/) do
diff --git a/features/step_definitions/reading_group_steps.rb b/features/step_definitions/reading_group_steps.rb
index 9510a15..5e29bd9 100644
--- a/features/step_definitions/reading_group_steps.rb
+++ b/features/step_definitions/reading_group_steps.rb
@@ -22,11 +22,11 @@ Given(/^I have a sample reading group$/) do
 end
 
 Given(/^I visit the Sample Reading Group page$/) do
-  visit reading_group_path(@reading_group.id)
+  visit reading_group_path(id: @reading_group.id)
 end
 
 Given(/^I am at the sample reading group edit page$/) do
-  visit edit_reading_group_path(@reading_group.id)
+  visit edit_reading_group_path(id: @reading_group.id)
 end
 
 Given(/^I own a reading group named "(.*?)"$/) do |name|
@@ -35,7 +35,7 @@ Given(/^I own a reading group named "(.*?)"$/) do |name|
 end
 
 When(/^I visit the sample reading group edit page$/) do
-  visit edit_reading_group_path(@reading_group.id)
+  visit edit_reading_group_path(id: @reading_group.id)
 end
 
 Then(/^The field "(.*?)" should be filled with the sample reading group "(.*?)"$/) do |field, value|
@@ -57,7 +57,7 @@ Then(/^I should see the information of the sample reading$/) do
 end
 
 Then(/^I should be in the Edit Reading Group page$/) do
-  visit edit_reading_group_path(@reading_group.id)
+  visit edit_reading_group_path(id: @reading_group.id)
 end
 
 Then(/^the Sample Reading Group should not be there$/) do
diff --git a/features/step_definitions/reading_steps.rb b/features/step_definitions/reading_steps.rb
index 931d940..2f7e55c 100644
--- a/features/step_definitions/reading_steps.rb
+++ b/features/step_definitions/reading_steps.rb
@@ -3,11 +3,11 @@ Given(/^I have a sample reading within the sample reading group$/) do
 end
 
 Given(/^I am at the New Reading page$/) do
-  visit new_reading_group_reading_path(@reading_group.id)
+  visit new_reading_group_reading_path(reading_group_id: @reading_group.id)
 end
 
 Given(/^I am at the Edit Reading page$/) do
-  visit edit_reading_group_reading_path(@reading_group.id, @reading.id)
+  visit edit_reading_group_reading_path(reading_group_id: @reading_group.id, id: @reading.id)
 end
 
 Given(/^I have a sample reading within the sample reading group labeled "(.*?)"$/) do |label|
@@ -23,7 +23,7 @@ When(/^I click on the center of the color picker$/) do
 end
 
 Then(/^I should be at the New Reading page$/) do
-  visit new_reading_group_reading_path(@reading_group.id)
+  visit new_reading_group_reading_path(reading_group_id: @reading_group.id)
 end
 
 Then(/^I should see a color picker Canvas$/) do
diff --git a/features/step_definitions/repository_steps.rb b/features/step_definitions/repository_steps.rb
index 173382e..277775f 100644
--- a/features/step_definitions/repository_steps.rb
+++ b/features/step_definitions/repository_steps.rb
@@ -64,11 +64,11 @@ Given(/^I wait up for a error processing$/) do
 end
 
 Given(/^I am at the New Repository page$/) do
-  visit new_project_repository_path(@project.id)
+  visit new_project_repository_path(project_id: @project.id)
 end
 
 Given(/^I am at repository edit page$/) do
-  visit edit_project_repository_path(@repository.project_id, @repository.id)
+  visit edit_project_repository_path(project_id: @repository.project_id, id: @repository.id)
 end
 
 Given(/^I ask for the last ready processing of the given repository$/) do
@@ -96,7 +96,7 @@ When(/^I set the select field "(.+)" as "(.+)"$/) do |field, text|
 end
 
 When(/^I visit the repository show page$/) do
-  visit project_repository_path(@project.id, @repository.id)
+  visit project_repository_path(project_id: @project.id, id: @repository.id)
 end
 
 When(/^I click on the sample child's name$/) do
diff --git a/spec/controllers/base_metric_configurations_controller_spec.rb b/spec/controllers/base_metric_configurations_controller_spec.rb
index f298b08..d24723f 100644
--- a/spec/controllers/base_metric_configurations_controller_spec.rb
+++ b/spec/controllers/base_metric_configurations_controller_spec.rb
@@ -80,7 +80,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type => :controller do
         get :new, kalibro_configuration_id: kalibro_configuration.id
       end
 
-      it { is_expected.to redirect_to(kalibro_configurations_url(kalibro_configuration.id)) }
+      it { is_expected.to redirect_to(kalibro_configurations_url(id: kalibro_configuration.id)) }
       it { is_expected.to respond_with(:redirect) }
     end
   end
diff --git a/spec/controllers/compound_metric_configurations_controller_spec.rb b/spec/controllers/compound_metric_configurations_controller_spec.rb
index ecadf03..4aaa18f 100644
--- a/spec/controllers/compound_metric_configurations_controller_spec.rb
+++ b/spec/controllers/compound_metric_configurations_controller_spec.rb
@@ -25,7 +25,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
         get :new, kalibro_configuration_id: kalibro_configuration.id
       end
 
-      it { is_expected.to redirect_to(kalibro_configurations_url(kalibro_configuration.id)) }
+      it { is_expected.to redirect_to(kalibro_configurations_url(id: kalibro_configuration.id)) }
       it { is_expected.to respond_with(:redirect) }
     end
   end
@@ -107,7 +107,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
           get :edit, id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id.to_s
         end
 
-        it { is_expected.to redirect_to(kalibro_configurations_path(kalibro_configuration.id)) }
+        it { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id)) }
         it { is_expected.to respond_with(:redirect) }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
@@ -144,7 +144,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
             post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
           end
 
-          it { should redirect_to(kalibro_configuration_path(compound_metric_configuration.kalibro_configuration_id)) }
+          it { should redirect_to(kalibro_configuration_path(id: compound_metric_configuration.kalibro_configuration_id)) }
           it { should respond_with(:redirect) }
         end
 
@@ -166,7 +166,7 @@ describe CompoundMetricConfigurationsController, :type => :controller do
           post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id, metric_configuration: metric_configuration_params
         end
 
-        it { should redirect_to kalibro_configurations_path(compound_metric_configuration.kalibro_configuration_id) }
+        it { should redirect_to kalibro_configurations_path(id: compound_metric_configuration.kalibro_configuration_id) }
       end
     end
   end
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index 1447db4..77a4ac3 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -32,6 +32,10 @@ describe HomeController, :type => :controller do
           get :index
           expect(I18n.locale).to eq(:en)
         end
+
+        after do
+          I18n.locale = I18n.default_locale
+        end
       end
     end
   end
diff --git a/spec/controllers/kalibro_configurations_controller_spec.rb b/spec/controllers/kalibro_configurations_controller_spec.rb
index 1c9bbbe..c65dc7c 100644
--- a/spec/controllers/kalibro_configurations_controller_spec.rb
+++ b/spec/controllers/kalibro_configurations_controller_spec.rb
@@ -31,7 +31,7 @@ describe KalibroConfigurationsController, :type => :controller do
         end
 
         it 'should redirect to the show view' do
-          expect(response).to redirect_to kalibro_configuration_path(kalibro_configuration.id)
+          expect(response).to redirect_to kalibro_configuration_path(id: kalibro_configuration.id)
         end
       end
 
@@ -119,7 +119,7 @@ describe KalibroConfigurationsController, :type => :controller do
           delete :destroy, :id => @subject.id
         end
 
-         it { is_expected.to redirect_to(kalibro_configurations_path(@subject.id))  }
+         it { is_expected.to redirect_to(kalibro_configurations_path(id: @subject.id))  }
       end
     end
 
@@ -181,7 +181,7 @@ describe KalibroConfigurationsController, :type => :controller do
           get :edit, :id => @subject.id
         end
 
-        it { is_expected.to redirect_to(kalibro_configurations_path(@subject.id))  }
+        it { is_expected.to redirect_to(kalibro_configurations_path(id: @subject.id))  }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
     end
@@ -225,7 +225,7 @@ describe KalibroConfigurationsController, :type => :controller do
             end
 
             it 'should redirect to the show view' do
-              expect(response).to redirect_to kalibro_configuration_path(kalibro_configuration.id)
+              expect(response).to redirect_to kalibro_configuration_path(id: kalibro_configuration.id)
             end
           end
 
@@ -255,7 +255,7 @@ describe KalibroConfigurationsController, :type => :controller do
           post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
         end
 
-        it { is_expected.to redirect_to kalibro_configurations_path(kalibro_configuration.id) }
+        it { is_expected.to redirect_to kalibro_configurations_path(id: kalibro_configuration.id) }
       end
     end
 
diff --git a/spec/controllers/kalibro_ranges_controller_spec.rb b/spec/controllers/kalibro_ranges_controller_spec.rb
index 56803c1..ad20f93 100644
--- a/spec/controllers/kalibro_ranges_controller_spec.rb
+++ b/spec/controllers/kalibro_ranges_controller_spec.rb
@@ -28,7 +28,7 @@ describe KalibroRangesController, :type => :controller do
         get :new, kalibro_configuration_id: kalibro_configuration.id, metric_configuration_id: kalibro_range.metric_configuration_id
       end
 
-      it { is_expected.to redirect_to(kalibro_configurations_path(kalibro_configuration.id)) }
+      it { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id)) }
       it { is_expected.to respond_with(:redirect) }
     end
   end
@@ -54,7 +54,7 @@ describe KalibroRangesController, :type => :controller do
           post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration_id: kalibro_range.metric_configuration_id, kalibro_range: kalibro_range_params
         end
 
-        it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.kalibro_configuration_id, metric_configuration.id)) }
+        it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -69,7 +69,7 @@ describe KalibroRangesController, :type => :controller do
           post :create, kalibro_configuration_id: kalibro_configuration.id, metric_configuration_id: new_kalibro_range.metric_configuration_id, kalibro_range: new_kalibro_range.to_hash
         end
 
-        it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(compound_metric_configuration.kalibro_configuration_id, compound_metric_configuration.id)) }
+        it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -103,7 +103,7 @@ describe KalibroRangesController, :type => :controller do
           delete :destroy, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id
         end
 
-        it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.kalibro_configuration_id, metric_configuration.id)) }
+        it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -120,7 +120,7 @@ describe KalibroRangesController, :type => :controller do
           delete :destroy, id: new_kalibro_range.id, metric_configuration_id: compound_metric_configuration.id, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id
         end
 
-        it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(compound_metric_configuration.kalibro_configuration_id, compound_metric_configuration.id)) }
+        it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -129,7 +129,7 @@ describe KalibroRangesController, :type => :controller do
           delete :destroy, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id
         end
 
-        it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.kalibro_configuration_id)) }
+        it { is_expected.to redirect_to(kalibro_configurations_path(id: metric_configuration.kalibro_configuration_id)) }
         it { is_expected.to respond_with(:redirect) }
       end
     end
@@ -172,7 +172,7 @@ describe KalibroRangesController, :type => :controller do
           get :edit, id: kalibro_range.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, metric_configuration_id: metric_configuration.id
         end
 
-        it { is_expected.to redirect_to(kalibro_configurations_url(metric_configuration.kalibro_configuration_id)) }
+        it { is_expected.to redirect_to(kalibro_configurations_url(id: metric_configuration.kalibro_configuration_id)) }
         it { is_expected.to respond_with(:redirect) }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
@@ -212,7 +212,7 @@ describe KalibroRangesController, :type => :controller do
             post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_range: kalibro_range_params
           end
 
-          it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(metric_configuration.kalibro_configuration_id, metric_configuration.id)) }
+          it { is_expected.to redirect_to(kalibro_configuration_metric_configuration_path(kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id)) }
           it { is_expected.to respond_with(:redirect) }
         end
 
@@ -228,7 +228,7 @@ describe KalibroRangesController, :type => :controller do
             post :update, kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: new_kalibro_range.id, metric_configuration_id: compound_metric_configuration.id, kalibro_range: new_kalibro_range.to_hash
           end
 
-          it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(compound_metric_configuration.kalibro_configuration_id, compound_metric_configuration.id)) }
+          it { is_expected.to redirect_to(kalibro_configuration_compound_metric_configuration_path(kalibro_configuration_id: compound_metric_configuration.kalibro_configuration_id, id: compound_metric_configuration.id)) }
           it { is_expected.to respond_with(:redirect) }
         end
 
@@ -251,7 +251,7 @@ describe KalibroRangesController, :type => :controller do
           post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: kalibro_range.id, metric_configuration_id: metric_configuration.id, kalibro_range: kalibro_range_params
         end
 
-        it { is_expected.to redirect_to kalibro_configurations_path(metric_configuration.kalibro_configuration_id) }
+        it { is_expected.to redirect_to kalibro_configurations_path(id: metric_configuration.kalibro_configuration_id) }
       end
     end
   end
diff --git a/spec/controllers/metric_configurations_controller_spec.rb b/spec/controllers/metric_configurations_controller_spec.rb
index b17b6ec..bdef8d9 100644
--- a/spec/controllers/metric_configurations_controller_spec.rb
+++ b/spec/controllers/metric_configurations_controller_spec.rb
@@ -45,7 +45,7 @@ describe MetricConfigurationsController, :type => :controller do
         post :new, kalibro_configuration_id: kalibro_configuration.id, metric_name: "Lines of Code", metric_collector_name: metric_collector.name
       end
 
-      it { is_expected.to redirect_to(kalibro_configurations_url(kalibro_configuration.id)) }
+      it { is_expected.to redirect_to(kalibro_configurations_url(id: kalibro_configuration.id)) }
       it { is_expected.to respond_with(:redirect) }
     end
   end
@@ -129,7 +129,7 @@ describe MetricConfigurationsController, :type => :controller do
           get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s
         end
 
-        it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.kalibro_configuration_id)) }
+        it { is_expected.to redirect_to(kalibro_configurations_path(id: metric_configuration.kalibro_configuration_id)) }
         it { is_expected.to respond_with(:redirect) }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
@@ -166,7 +166,7 @@ describe MetricConfigurationsController, :type => :controller do
             post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params
           end
 
-          it { is_expected.to redirect_to(kalibro_configuration_path(metric_configuration.kalibro_configuration_id)) }
+          it { is_expected.to redirect_to(kalibro_configuration_path(id: metric_configuration.kalibro_configuration_id)) }
           it { is_expected.to respond_with(:redirect) }
         end
 
@@ -187,7 +187,7 @@ describe MetricConfigurationsController, :type => :controller do
           post :update, kalibro_configuration_id: metric_configuration.kalibro_configuration_id, id: metric_configuration.id, metric_configuration: metric_configuration_params
         end
 
-        it { is_expected.to redirect_to kalibro_configurations_path(metric_configuration.kalibro_configuration_id) }
+        it { is_expected.to redirect_to kalibro_configurations_path(id: metric_configuration.kalibro_configuration_id) }
       end
     end
   end
@@ -210,7 +210,7 @@ describe MetricConfigurationsController, :type => :controller do
           delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s
         end
 
-        it { is_expected.to redirect_to(kalibro_configuration_path(metric_configuration.kalibro_configuration_id)) }
+        it { is_expected.to redirect_to(kalibro_configuration_path(id: metric_configuration.kalibro_configuration_id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -219,7 +219,7 @@ describe MetricConfigurationsController, :type => :controller do
           delete :destroy, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s
         end
 
-         it { is_expected.to redirect_to(kalibro_configurations_path(metric_configuration.kalibro_configuration_id)) }
+         it { is_expected.to redirect_to(kalibro_configurations_path(id: metric_configuration.kalibro_configuration_id)) }
          it { is_expected.to respond_with(:redirect) }
       end
     end
diff --git a/spec/controllers/repositories_controller_spec.rb b/spec/controllers/repositories_controller_spec.rb
index 999b576..264d458 100644
--- a/spec/controllers/repositories_controller_spec.rb
+++ b/spec/controllers/repositories_controller_spec.rb
@@ -60,7 +60,7 @@ describe RepositoriesController, :type => :controller do
           post :create, project_id: project.id, repository: repository_params
         end
 
-        it { is_expected.to redirect_to(project_repository_process_path(repository.project_id, repository.id)) }
+        it { is_expected.to redirect_to(project_repository_process_path(project_id: repository.project_id, id: repository.id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
diff --git a/spec/routing/home_routing_spec.rb b/spec/routing/home_routing_spec.rb
index f9d84f7..6cebf71 100644
--- a/spec/routing/home_routing_spec.rb
+++ b/spec/routing/home_routing_spec.rb
@@ -4,5 +4,7 @@ describe HomeController, :type => :routing do
   describe "routing" do
     it { is_expected.to route(:get, '/').
                   to(controller: :home, action: :index) }
+    it { is_expected.to route(:get, '/pt').
+                  to(controller: :home, action: :index, locale: 'pt') }
   end
 end
\ No newline at end of file
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 5d0bea0..a25e7c8 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -8,6 +8,9 @@ describe ProjectsController, :type => :routing do
     it { is_expected.to route(:get, '/projects').
                   to(controller: :projects, action: :index) }
 
+    it { is_expected.to route(:get, '/pt/projects').
+                  to(controller: :projects, action: :index, locale: 'pt') }
+
     it { is_expected.to route(:post, '/projects').
                   to(controller: :projects, action: :create) }
 
--
libgit2 0.21.2