Adjust specs for empact AND master

Author: iboard

app/assets/javascripts/avatar.js.coffee

@@ -12,7 +12,7 @@ class AvatarCropper
 
   update: (coords) =>
     if $('#avatar_original').val() <= 100
-      alert "<= 100"
+      alert "WARNING: Image is to small min 100px!"
     scale = parseInt($('#avatar_original').val()) / parseInt($('#avatar_large').val())
     $('#crop_x').val(coords.x*scale)
     $('#crop_y').val(coords.y*scale)

app/controllers/application_controller.rb

@@ -64,7 +64,8 @@ def can_execute?(what)
 
   def ensure_locale
     set_locale = I18n.default_locale
-    return unless Settings.multilanuage == true
+    return if Settings.multilanuage == false
+    
     session[:locale] ||= cookies[:locale]
     if session[:locale]
       set_locale = session[:locale]

app/controllers/sessions_controller.rb

@@ -55,7 +55,7 @@ def failure
   end
 
   def switch_language
-    if Settings.multilanuage == true
+    if Settings.multilanuage != false
       session[:locale] = params[:locale].to_sym
       cookies.permanent[:locale] = params[:locale].to_sym
       _msg = {:notice => t(:language_changed_to, :lang => t(params[:locale].to_sym))}
@@ -72,7 +72,6 @@ def dirty_link_to(body,url)
   end
 
   def signed_in_successfully
-    #redirect_to root_url, :notice => 'OK'
     back_url = session[:login_for_request] || root_url
     back_url.gsub! /[\A"|"\Z]/,''
     redirect_to back_url, :notice => t(:signed_in)

app/views/pages/_banner.haml

@@ -1,4 +1,7 @@
 = link_to image_tag(banner.banner.url(:large)), banner.page
 %div{class: "carousel-caption layout-#{banner.page.banner_text_position || 'right'}"}
-  %h2=banner.page.banner_title
-  %p=banner.page.banner_text
+  - if banner.linked_url != '#'
+    %h2=link_to banner.linked_url, banner.linked_url, target: :blank
+  - else
+    %h2=banner.page.banner_title
+  %p=banner.page.banner_text

app/views/pages/_page.haml

@@ -6,9 +6,9 @@
 
   %div{:style=> params[:controller]=='home' ? 'min-height: 200px;' : ''}
     = render 'pages/page_menu', page: page
-    - if truncated      
+    - if truncated && Settings.supress_page_title != true
       %h2= link_to page.title, page
-    - else
+    - elsif Settings.supress_page_title != true
       %h2=page.title
     %article
       - present page do |presenter|

app/views/pages/show.haml

@@ -1,3 +1,4 @@
+- title @page.title
 - present @page do |presenter|
   - if @page.banner && @page.banner.banner.exists?
     .row-fluid
@@ -9,11 +10,13 @@
   .row-fluid
     - if @page 
       %article
+        - unless Settings.supress_page_title == true
+          %h1=presenter.title
         = render 'pages_menu'
         .content= presenter.body
     - else
       .alert.alert-error= t(:page_not_found)
 
-- if can_execute?('Admin')
+- unless Settings.multilanguage == false
   .row-fluid
     = render 'translations', page: @page   

config/settings/test.yml

@@ -11,4 +11,7 @@ smtp_default_from: "[email protected]"
 
 application_brand: "WAT-HOME"
 application_mail_signature: WAT TEST APPLICATION
-application_mail_subject_prefix: "WAT: "
+application_mail_subject_prefix: "WAT: "
+
+supress_page_title: false
+multilanguage: true

fixtures/avatar.jpg

@@ -3,11 +3,16 @@
 describe "Internationalization" do
   it "switches language" do
     visit root_path
-    page.should have_content "Sign in"
-    click_link "Deutsch"
-    page.should have_content "Anmelden"
-    click_link "English"
-    page.should have_content "Sign in"
+    if Settings.multilanguage == true
+      page.should have_content "Sign in"
+      click_link "Deutsch"
+      page.should have_content "Anmelden"
+      click_link "English"
+      page.should have_content "Sign in"
+    else
+      visit switch_language_path(:de)
+      page.should have_content I18n.t(:cannot_change_language)
+    end
   end
 end
 

spec/integration/i18n_spec.rb

@@ -80,7 +80,7 @@
       attach_file("application_file_file", File.join(Rails.root,'fixtures', 'avatar.jpg'))
       click_button("Upload file")
       page.should have_content 'avatar.jpg'
-      page.should have_content '3 KB'
+      page.should have_content '117 KB'
       click_link "Delete"
       if _path
         File.exist?(_path).should be_false

spec/requests/attachments_controller_spec.rb

@@ -40,7 +40,7 @@
       _usr.facilities.find_or_create_by( name: 'Admin', access: 'rwx' )
       _usr.email_confirmed_at = Time.now
       _usr.save!
-      visit switch_language_path(:en)
+      visit switch_language_path(:en) if Settings.multilanguage == true
       visit page_path(@page)
     end
 
@@ -49,7 +49,11 @@
       fill_in "page_body", with: "This is a modified page."
 
       click_button "Save page"
-      page.should have_content @page.title
+      if Settings.supress_page_title != true
+        page.all('article h1', text: @page.title).first.should_not be_nil
+      else
+        page.all('article h1', text: @page.title).first.should be_nil
+      end
       page.should have_content "This is a modified page"
     end
 
@@ -65,7 +69,11 @@
       fill_in "page_body", with: lorem()
       click_button "Save page"
       page.should have_content "Page successfully created"
-      page.should have_content "A new page for WAT"
+      if Settings.supress_page_title != true
+        page.all('h1', text: "A new page for WAT").first.should_not be_nil
+      else
+        page.all('h1', text: "A new page for WAT").first.should_not be_nil
+      end
       page.should have_content "Lorem ipsum"
     end
 
@@ -83,6 +91,7 @@
     end
 
     describe "Translations" do
+
       before(:each) do
         visit switch_language_path(:en)
         click_link "Create page"

spec/requests/pages_controller_spec.rb

@@ -1,8 +1,8 @@
 # wat's Spec Helper
 
 unless defined?(TEXT_FILE_FIXTURE)
-  TEXT_FILE_FIXTURE   = File.expand_path('../../fixtures/testfile.txt', __FILE__)
-  PICTURE_FILE_FIXTURE= File.expand_path('../../fixtures/avatar.jpg',__FILE__)
+  TEXT_FILE_FIXTURE   = File.expand_path('../../../fixtures/testfile.txt', __FILE__)
+  PICTURE_FILE_FIXTURE= File.expand_path('../../../fixtures/avatar.jpg',__FILE__)
 
   # Create a user with Identity and Facilities through database
   # @param [String] username