Better user specs for joining tables

app/assets/javascripts/user/application.js.erb

@@ -154,7 +154,8 @@ String.prototype.capitalize = function() {
 function t(path, vars){
   vars || (vars = {});
   var parts = path.split('.');
-  var accessor = '$translations.'+$locale+'["' + parts.join('"]["')+ '"]';
+  var locale = Qstorage.getItem('locale') || 'en';
+  var accessor = '$translations.'+locale+'["' + parts.join('"]["')+ '"]';
   var result;
   try{ 
     result = eval(accessor);
@@ -175,7 +176,6 @@ $.ajaxSetup({
   }
 });
 $(function(){
-  $locale = Qstorage.getItem('locale') || 'en';
   if(Qstorage.getItem('message')){
     var container = $('.alert-success');
     var msg_finder = Qstorage.getItem('message');
@@ -186,7 +186,7 @@ $(function(){
   }
   if(Qstorage.getItem('list_closed')){
     var container = $('.alert-error');
-    container.find('div').text($translations[$locale]['messages']['the_list_has_been_closed']);
+    container.find('div').text(t('messages.the_list_has_been_closed'));
     container.show();
     Qstorage.removeItem('list_closed');
   }
@@ -194,7 +194,6 @@ $(function(){
 });
 function setLocale(locale){
   Qstorage.setItem('locale', locale);
-  $locale = locale;
   setTranslations();
 }
 function Qupdate(selector){
@@ -202,8 +201,9 @@ function Qupdate(selector){
 }
 function setTranslations(selector){
   var list = $('#top-navigation-list');
+  var locale = Qstorage.getItem('locale');
   list.find('.locale').show();
-  list.find('.locale-'+$locale).hide();
+  list.find('.locale-'+locale).hide();
   if(selector){
     $(selector).find('[data-t]').each(function(){$(this).text(t($(this).attr('data-t')))})
   }else{

app/controllers/admin/users_controller.rb

@@ -1,6 +1,7 @@
 module Admin
   class UsersController < Admin::ApplicationController
     skip_before_filter :authenticate_administrator!, only: :test_login
+    skip_before_filter :set_locale, only: :test_login
     # GET /users
     # GET /users.json
     def index
@@ -27,8 +28,10 @@ module Admin
     def test_login
       if Rails.env.test? and user = User.find_by_email(params[:email])
         sign_in user
+        render layout: false
+      else
+        render nothing: true
       end
-      render nothing: true
     end
 
     # GET /users/new

app/controllers/application_controller.rb

@@ -24,7 +24,7 @@ private
   end
 
   def set_locale
-    I18n.locale = (params[:locale].presence || Rails.configuration.i18n.default_locale).to_sym
+    I18n.locale = (params[:locale].presence || I18n.default_locale).to_sym
   end
 
   def layout_by_resource

app/templates/user/_join_request.mustache

@@ -7,7 +7,7 @@
     <p>{{message}}</p>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" onclick="Quser.reject_join_request('{{requester_id}}')"  data-dismiss="modal" aria-hidden="true">{{reject}}</a>
-    <a href="#" class="btn btn-primary" onclick="Quser.approve_join_request('{{requester_id}}')"  data-dismiss="modal" aria-hidden="true">{{approve}}</a>
+    <a href="#" class="btn reject-join-request-button" onclick="Quser.reject_join_request('{{requester_id}}')"  data-dismiss="modal" aria-hidden="true">{{reject}}</a>
+    <a href="#" class="btn btn-primary approve-join-request-button" onclick="Quser.approve_join_request('{{requester_id}}')"  data-dismiss="modal" aria-hidden="true">{{approve}}</a>
   </div>
 </div>

app/views/admin/users/test_login.html.slim

@@ -0,0 +1,12 @@
+doctype html
+html
+  head
+    javascript:
+      localStorage.setItem('auth_token', '#{current_user.authentication_token}');
+      localStorage.setItem('user_id', '#{current_user.id}');
+      localStorage.setItem('locale', '#{I18n.default_locale}');
+
+
+  body
+    p Test login page
+    p= "Signed in as: #{current_user.email}"

app/views/layouts/phone.html.slim

@@ -21,7 +21,6 @@ html lang="en"
         var QMobile, Qwaiter, Quser;
         var data_host = 'http://data.qwaiter.com';
         var event_host = '#{event_host}';
-        var $locale = 'en';
         var $asset_path = '##assets_path##';
         var Qstorage = localStorage;
     - else
@@ -29,7 +28,6 @@ html lang="en"
         var QMobile, Qwaiter, Quser;
         var data_host = 'http://data.qwaiter.com';
         var event_host = '#{event_host}';
-        var $locale = 'en';
         var $asset_path = '/assets/';
         var Qstorage = localStorage;
         #{user_dynamic_data_host}
@@ -48,8 +46,6 @@ html lang="en"
           root_url: function(){return '/user'},
           goHome: function(){ redirect_to('user_root')},
           connection_problem: function(){alert('There is a problem connecting to the server')},
-          locale: function(){ return $locale || ($locale = 'en')},
-          setLocale: function(locale){$locale = locale; return locale},
           token: function(){return this.auth_token},
           setUserId: function(id){ this.stored_user_id = id},
           user_id: function(){return this.stored_user_id },

app/views/user/join_occupied_table.html.slim

@@ -3,8 +3,8 @@
 .form-actions
   = link_to t('user.join_occupied_table.back'), user_root_path, class: :btn, data: {t: 'join_request.requestor.go_back'}
   '
-  button.btn.btn-primary onclick="Quser.show_table_products()" data-t='join_request.requestor.show_the_products'= t('user.join_occupied_table.show_the_products')
+  button.btn.btn-primary.show-menu-button onclick="Quser.show_table_products()" data-t='join_request.requestor.show_the_products'= t('user.join_occupied_table.show_the_products')
   '
-  button.btn.btn-warning onClick="Quser.join_occupied_table()" data-t='join_request.requestor.join_this_table'= t('user.join_occupied_table.join_this_table')
+  button.btn.btn-warning.join-table-button onClick="Quser.join_occupied_table()" data-t='join_request.requestor.join_this_table'= t('user.join_occupied_table.join_this_table')
 #join-occupied-table-progress-container
 - onload_javascript 'Quser.watch_events()'