From ef7df97949e11eb0648fdb71cb8b13fef845944d Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 15 Feb 2015 17:10:17 +0100 Subject: [PATCH] Table lugs renamed to orgas --- app/admin/{lug.rb => orga.rb} | 2 +- app/assets/stylesheets/all.css.sass | 2 +- app/assets/stylesheets/events.css.sass | 2 +- app/assets/stylesheets/maps.css.sass | 2 +- app/assets/stylesheets/mobile.css.sass | 8 +-- .../{lugs.css.sass => orgas.css.sass} | 6 +-- app/controllers/lugs_controller.rb | 24 --------- app/controllers/orgas_controller.rb | 24 +++++++++ app/helpers/lugs_helper.rb | 14 ----- app/helpers/orgas_helper.rb | 14 +++++ app/models/city.rb | 4 +- app/models/{lug.rb => orga.rb} | 2 +- app/models/region.rb | 2 +- app/views/events/index.html.haml | 2 +- app/views/events/show.html.haml | 16 +++--- app/views/layouts/application.html.haml | 4 +- app/views/lugs/index.html.haml | 36 ------------- app/views/{lugs => orgas}/_search.html.haml | 6 +-- app/views/orgas/index.html.haml | 36 +++++++++++++ app/views/{lugs => orgas}/show.html.haml | 50 +++++++++--------- config/locales/models/en.yml | 4 +- config/locales/models/fr.yml | 4 +- config/locales/views/en.yml | 6 +-- config/locales/views/fr.yml | 6 +-- config/routes.rb | 2 +- db/migrate/20150215151059_rename_table_lug.rb | 6 +++ db/schema.rb | 18 +++---- db/schema_cache.dump | Bin 0 -> 7970 bytes ...oller_test.rb => orgas_controller_test.rb} | 6 +-- test/fixtures/{lugs.yml => orgas.yml} | 0 test/helpers/lugs_helper_test.rb | 4 -- test/helpers/orgas_helper_test.rb | 4 ++ test/models/{lug_test.rb => orga_test.rb} | 2 +- 33 files changed, 162 insertions(+), 156 deletions(-) rename app/admin/{lug.rb => orga.rb} (95%) rename app/assets/stylesheets/{lugs.css.sass => orgas.css.sass} (96%) delete mode 100644 app/controllers/lugs_controller.rb create mode 100644 app/controllers/orgas_controller.rb delete mode 100644 app/helpers/lugs_helper.rb create mode 100644 app/helpers/orgas_helper.rb rename app/models/{lug.rb => orga.rb} (64%) delete mode 100644 app/views/lugs/index.html.haml rename app/views/{lugs => orgas}/_search.html.haml (58%) create mode 100644 app/views/orgas/index.html.haml rename app/views/{lugs => orgas}/show.html.haml (60%) create mode 100644 db/migrate/20150215151059_rename_table_lug.rb create mode 100644 db/schema_cache.dump rename test/controllers/{lugs_controller_test.rb => orgas_controller_test.rb} (68%) rename test/fixtures/{lugs.yml => orgas.yml} (100%) delete mode 100644 test/helpers/lugs_helper_test.rb create mode 100644 test/helpers/orgas_helper_test.rb rename test/models/{lug_test.rb => orga_test.rb} (65%) diff --git a/app/admin/lug.rb b/app/admin/orga.rb similarity index 95% rename from app/admin/lug.rb rename to app/admin/orga.rb index 247b7605..e4e8797d 100644 --- a/app/admin/lug.rb +++ b/app/admin/orga.rb @@ -1,4 +1,4 @@ -ActiveAdmin.register Lug do +ActiveAdmin.register Orga do permit_params :name, :url, :city, :department, :region index do diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index b94d9a7a..bbbf7449 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -23,7 +23,7 @@ html margin: 0 padding: 0 background-color: transparent - h2, nav, .region_selector, .lug_search, .formats, #banner + h2, nav, .region_selector, .orga_search, .formats, #banner display: none body diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index 5af1501a..28ed156d 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -116,7 +116,7 @@ body.events.show main h2 margin-top: 1em -aside#lug-list +aside#orga-list float: right width: 16em border: 1px solid #96CFFF diff --git a/app/assets/stylesheets/maps.css.sass b/app/assets/stylesheets/maps.css.sass index 1c22b03f..58e7e471 100644 --- a/app/assets/stylesheets/maps.css.sass +++ b/app/assets/stylesheets/maps.css.sass @@ -14,7 +14,7 @@ &.event height: 20em -.tags, .lugs +.tags, .orgas #map width: 40% height: 60em diff --git a/app/assets/stylesheets/mobile.css.sass b/app/assets/stylesheets/mobile.css.sass index 06280c35..e2d52508 100644 --- a/app/assets/stylesheets/mobile.css.sass +++ b/app/assets/stylesheets/mobile.css.sass @@ -4,7 +4,7 @@ body font-size: larger - aside#lug-list + aside#orga-list width: auto #advises @@ -14,7 +14,7 @@ body.events.index table width: 100% - form#lug_search + form#orga_search right: 0 .formats, a#banner margin: 0.6em auto @@ -40,7 +40,7 @@ main ul margin-left: 0 - form#lug_search + form#orga_search font-size: smaller /* For small screen width */ @@ -59,7 +59,7 @@ h2 font-size: initial - form#lug_search + form#orga_search display: none body.events.index table diff --git a/app/assets/stylesheets/lugs.css.sass b/app/assets/stylesheets/orgas.css.sass similarity index 96% rename from app/assets/stylesheets/lugs.css.sass rename to app/assets/stylesheets/orgas.css.sass index 3bf34cbb..bc3784e6 100644 --- a/app/assets/stylesheets/lugs.css.sass +++ b/app/assets/stylesheets/orgas.css.sass @@ -5,7 +5,7 @@ img.favicon vertical-align: middle +border-radius(3px) -form#lug_search +form#orga_search right: 5% width: 12em position: absolute @@ -40,8 +40,8 @@ form#lug_search span.label display: none -body.show +body.show main dl, iframe, fieldset min-width: 30em - vertical-align: top +inline-block() + vertical-align: top diff --git a/app/controllers/lugs_controller.rb b/app/controllers/lugs_controller.rb deleted file mode 100644 index 2e0240c8..00000000 --- a/app/controllers/lugs_controller.rb +++ /dev/null @@ -1,24 +0,0 @@ -# Groups life cycle -class LugsController < ApplicationController - before_action :set_lug, only: [:show] - - def index - @search = Lug.search params[:q] - @search.sorts = 'name' if @search.sorts.empty? - @lugs = @search.result.page params[:page] - end - - def show - @search = Lug.search params[:q] - - @events_future = Event.moderated.future.tag @lug.name - @events_past = Event.moderated.past.tag @lug.name - end - - private - - # Use callbacks to share common setup or constraints between actions. - def set_lug - @lug = Lug.find params[:id] - end -end diff --git a/app/controllers/orgas_controller.rb b/app/controllers/orgas_controller.rb new file mode 100644 index 00000000..68119b71 --- /dev/null +++ b/app/controllers/orgas_controller.rb @@ -0,0 +1,24 @@ +# Groups life cycle +class OrgasController < ApplicationController + before_action :set_orga, only: [:show] + + def index + @search = Orga.search params[:q] + @search.sorts = 'name' if @search.sorts.empty? + @orgas = @search.result.page params[:page] + end + + def show + @search = Orga.search params[:q] + + @events_future = Event.moderated.future.tag @orga.name + @events_past = Event.moderated.past.tag @orga.name + end + + private + + # Use callbacks to share common setup or constraints between actions. + def set_orga + @orga = Orga.find params[:id] + end +end diff --git a/app/helpers/lugs_helper.rb b/app/helpers/lugs_helper.rb deleted file mode 100644 index 08d56a69..00000000 --- a/app/helpers/lugs_helper.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Helper for the lug views -module LugsHelper - def set_lug_meta - set_meta_tags \ - description: @lug.url, - DC: { title: @lug.name }, - geo: { - region: @lug.region, - placename: @lug.city, - position: "#{@lug.city.try :latitude};" \ - + "#{@lug.city.try :longitude}" - } - end -end diff --git a/app/helpers/orgas_helper.rb b/app/helpers/orgas_helper.rb new file mode 100644 index 00000000..264a1582 --- /dev/null +++ b/app/helpers/orgas_helper.rb @@ -0,0 +1,14 @@ +# Helper for the orga views +module OrgasHelper + def set_orga_meta + set_meta_tags \ + description: @orga.url, + DC: { title: @orga.name }, + geo: { + region: @orga.region, + placename: @orga.city, + position: "#{@orga.city.try :latitude};" \ + + "#{@orga.city.try :longitude}" + } + end +end diff --git a/app/models/city.rb b/app/models/city.rb index fb0e229f..068451f0 100644 --- a/app/models/city.rb +++ b/app/models/city.rb @@ -1,8 +1,8 @@ -# This class is linked to events and lugs +# This class is linked to events and organisations # # It is mainly used to manage coordinates # class City < ActiveRecord::Base has_many :events, foreign_key: :city, primary_key: :name - has_many :lugs, foreign_key: :city, primary_key: :name + has_many :orgas, foreign_key: :city, primary_key: :name end diff --git a/app/models/lug.rb b/app/models/orga.rb similarity index 64% rename from app/models/lug.rb rename to app/models/orga.rb index 1c83a5f4..e65eec1a 100644 --- a/app/models/lug.rb +++ b/app/models/orga.rb @@ -1,4 +1,4 @@ # Groups related to this agenda -class Lug < ActiveRecord::Base +class Orga < ActiveRecord::Base belongs_to :region end diff --git a/app/models/region.rb b/app/models/region.rb index bef0c5a2..e9f7140f 100644 --- a/app/models/region.rb +++ b/app/models/region.rb @@ -1,6 +1,6 @@ # This is mostly to group events around a region class Region < ActiveRecord::Base - has_many :lugs + has_many :orgas has_many :events default_scope { order :name } diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml index d8614ca7..2b10498f 100644 --- a/app/views/events/index.html.haml +++ b/app/views/events/index.html.haml @@ -1,4 +1,4 @@ -= render '/lugs/search' += render '/orgas/search' = render '/regions/selector' - if params[:year] diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index a671e4eb..d6d3eb96 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -9,19 +9,19 @@ = title @event.title - if controller.controller_name == 'events' && controller.action_name == 'show' - %aside#lug-list - - if @event.region.present? && @event.region.lugs.present? + %aside#orga-list + - if @event.region.present? && @event.region.orgas.present? %h1 %em.fa.fa-users - = t '.lug-list' + = t '.orga-list' - if @event.region %ul - - @event.region.lugs.order(department: :asc).each do |lug| + - @event.region.orgas.order(department: :asc).each do |orga| %li - = link_to lug.name, lug - (#{lug.department}) - = link_to lug.url do - = image_tag lug.url + '/favicon.ico', alt: '', class: :favicon + = link_to orga.name, orga + (#{orga.department}) + = link_to orga.url do + = image_tag orga.url + '/favicon.ico', alt: '', class: :favicon %h1 %em.fa.fa-wrench diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 83111668..777aca8c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -53,9 +53,9 @@ = link_to tags_path do %em.fa.fa-tags = t '.tags' - = link_to lugs_path do + = link_to orgas_path do %em.fa.fa-users - = Lug.model_name.human.pluralize + = Orga.model_name.human.pluralize = link_to application_infos_path do %em.fa.fa-info = t '.infos' diff --git a/app/views/lugs/index.html.haml b/app/views/lugs/index.html.haml deleted file mode 100644 index d52667f5..00000000 --- a/app/views/lugs/index.html.haml +++ /dev/null @@ -1,36 +0,0 @@ -%h2 - %em.fa.fa-users - = title t 'lugs.search.title', entity: Lug.model_name.human - -= render 'search' - -%table.list.autopagerize_page_element - %thead - %th= sort_link @search, :name - %th= sort_link @search, :city - %th= sort_link @search, :department - %th= sort_link @search, :region_name, Lug.human_attribute_name(:region) - %th= sort_link @search, :url - %th/ - - %tbody - - @lugs.each do |lug| - %tr - %td - - if lug.url =~ /^http/ - = image_tag lug.url + '/favicon.ico', alt: '', class: :favicon - = lug.name - %td - = lug.city - %td - = lug.department - %td - = lug.region - %td - = link_to lug.url, lug.url - %td - = link_to t('show'), - lug_path(lug, q: params[:q], page: params[:page]), - class: :view_link - -= paginate @lugs diff --git a/app/views/lugs/_search.html.haml b/app/views/orgas/_search.html.haml similarity index 58% rename from app/views/lugs/_search.html.haml rename to app/views/orgas/_search.html.haml index 597beea2..0e5df70a 100644 --- a/app/views/lugs/_search.html.haml +++ b/app/views/orgas/_search.html.haml @@ -1,9 +1,9 @@ -= search_form_for @search || Lug.search(params[:q]) do |f| += search_form_for @search || Orga.search(params[:q]) do |f| = f.label :search, t('.label') %em.fa.fa-users = f.search_field :name_or_city_or_department_or_region_name_or_url_cont, id: :q_search, size: 16, - placeholder: t('.title', entity: Lug.model_name.human) + placeholder: t('.title', entity: Orga.model_name.human) = f.button class: :search do %em.fa.fa-search - %span.label=t '.label' + %span.label= t '.label' diff --git a/app/views/orgas/index.html.haml b/app/views/orgas/index.html.haml new file mode 100644 index 00000000..3f4029ec --- /dev/null +++ b/app/views/orgas/index.html.haml @@ -0,0 +1,36 @@ +%h2 + %em.fa.fa-users + = title t 'orgas.search.title', entity: Orga.model_name.human + += render 'search' + +%table.list.autopagerize_page_element + %thead + %th= sort_link @search, :name + %th= sort_link @search, :city + %th= sort_link @search, :department + %th= sort_link @search, :region_name, Orga.human_attribute_name(:region) + %th= sort_link @search, :url + %th/ + + %tbody + - @orgas.each do |orga| + %tr + %td + - if orga.url =~ /^http/ + = image_tag orga.url + '/favicon.ico', alt: '', class: :favicon + = orga.name + %td + = orga.city + %td + = orga.department + %td + = orga.region + %td + = link_to orga.url, orga.url + %td + = link_to t('show'), + orga_path(orga, q: params[:q], page: params[:page]), + class: :view_link + += paginate @orgas diff --git a/app/views/lugs/show.html.haml b/app/views/orgas/show.html.haml similarity index 60% rename from app/views/lugs/show.html.haml rename to app/views/orgas/show.html.haml index 73109d90..741392da 100644 --- a/app/views/lugs/show.html.haml +++ b/app/views/orgas/show.html.haml @@ -1,52 +1,52 @@ -- set_lug_meta +- set_orga_meta = render 'search' %h2 - = image_tag @lug.url + '/favicon.ico', alt: '', class: :favicon - = title @lug.name + = image_tag @orga.url + '/favicon.ico', alt: '', class: :favicon + = title @orga.name %nav - = link_to lugs_path(q: params[:q], page: params[:page]), class: :back do + = link_to orgas_path(q: params[:q], page: params[:page]), class: :back do %em.fa.fa-arrow-left - = Lug.model_name.human.pluralize + = Orga.model_name.human.pluralize \/ - = link_to events_path tag: @lug.name do + = link_to events_path tag: @orga.name do %em.fa.fa-calendar Agenda \/ - = link_to events_path format: :rss, tag: @lug.name do + = link_to events_path format: :rss, tag: @orga.name do %em.fa.fa-rss RSS \/ - = link_to events_path format: :ics, tag: @lug.name do + = link_to events_path format: :ics, tag: @orga.name do %em.fa.fa-th-list iCal \/ - = link_to maps_path tag: @lug.name do + = link_to maps_path tag: @orga.name do %em.fa.fa-map-marker OpenStreetMap \/ - = link_to maps_path format: :json, tag: @lug.name do + = link_to maps_path format: :json, tag: @orga.name do %em.fa.fa-dot-circle-o GeoJSON %dl - - if @lug.city.present? - %dt= Lug.human_attribute_name :city - %dd= @lug.city - - if @lug.department.present? - %dt= Lug.human_attribute_name :department - %dd= @lug.department - - if @lug.region.present? - %dt= Lug.human_attribute_name :region - %dd= @lug.region - - if @lug.url.present? - %dt= Lug.human_attribute_name :url - %dd= link_to @lug.url, @lug.url + - if @orga.city.present? + %dt= Orga.human_attribute_name :city + %dd= @orga.city + - if @orga.department.present? + %dt= Orga.human_attribute_name :department + %dd= @orga.department + - if @orga.region.present? + %dt= Orga.human_attribute_name :region + %dd= @orga.region + - if @orga.url.present? + %dt= Orga.human_attribute_name :url + %dd= link_to @orga.url, @orga.url -%iframe(src="#{@lug.url}" width='1280' height='300' frameborder='none' - allowTransparency='true') +%iframe{ src: @orga.url, width: '1280', height: '300', frameborder: 'none', + allowTransparency: 'true' } - if @events_future.any? || @events_past.any? %fieldset @@ -82,4 +82,4 @@ = event.title .date= display_date event -.events#map(data-url="#{ maps_path format: :json, tag: @lug.name }") +.events#map{ data: { url: maps_path(format: :json, tag: @orga.name) } } diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml index f3d4fbe6..e6f1257b 100644 --- a/config/locales/models/en.yml +++ b/config/locales/models/en.yml @@ -15,7 +15,7 @@ en: models: event: Event user: Modérator - lug: Asso + orga: Asso city: City region: Region admin_user: Admin @@ -32,7 +32,7 @@ en: postalcode: Zip code inseecode: INSEE code regioncode: Region code - lug: + orga: region: Region department: Department url: Web address diff --git a/config/locales/models/fr.yml b/config/locales/models/fr.yml index 18580e32..e8dda278 100644 --- a/config/locales/models/fr.yml +++ b/config/locales/models/fr.yml @@ -15,7 +15,7 @@ fr: models: event: Événement user: Modérateur - lug: Asso + orga: Asso city: Ville region: Région admin_user: Admin @@ -32,7 +32,7 @@ fr: postalcode: Code postal inseecode: Code INSEE regioncode: Code région - lug: + orga: city: Ville department: Département region: Région diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 481f2d76..0fc4a81f 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -42,7 +42,7 @@ en: calendar_in: This calendar in %{rss}, %{webcal} or %{ical} nb_events: "%{count} events" show: - lug-list: Region's associations + orga-list: Region's associations add_to_calendar: Add to my calendar copy: Duplicate event at: At @@ -234,11 +234,11 @@ description." index: title: Events map events: Events - lugs: Association + orgas: Association users: sign_in: title: Authentication - lugs: + orgas: search: title: Find your %{entity}! label: Search diff --git a/config/locales/views/fr.yml b/config/locales/views/fr.yml index f7fd7653..bdb7aee4 100644 --- a/config/locales/views/fr.yml +++ b/config/locales/views/fr.yml @@ -42,7 +42,7 @@ fr: calendar_in: Ce calendrier en %{rss}, %{webcal} ou %{ical} nb_events: "%{count} événements" show: - lug-list: Asso de la région + orga-list: Asso de la région add_to_calendar: Ajouter à mon calendrier copy: Dupliquer événement at: À @@ -236,11 +236,11 @@ description plus complète." index: title: Carte des événements events: Événements - lugs: Asso + orgas: Asso users: sign_in: title: Identification - lugs: + orgas: search: title: Trouve ton %{entity}! label: Recherche diff --git a/config/routes.rb b/config/routes.rb index 120befa6..ad2bc7d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ Rails.application.routes.draw do resources :regions, only: [:index] resources :tags, only: [:index, :show] resources :maps, only: [:index] - resources :lugs, only: [:index, :show] + resources :orgas, only: [:index, :show] # Manage former php pages get 'showevent.php', to: redirect { |_, req| "events/#{req.params[:id]}" } diff --git a/db/migrate/20150215151059_rename_table_lug.rb b/db/migrate/20150215151059_rename_table_lug.rb new file mode 100644 index 00000000..d8557d79 --- /dev/null +++ b/db/migrate/20150215151059_rename_table_lug.rb @@ -0,0 +1,6 @@ +# Generalisation of the LUG concept to one of event's organiser +class RenameTableLug < ActiveRecord::Migration + def change + rename_table :lugs, :orgas + end +end diff --git a/db/schema.rb b/db/schema.rb index f8d4f036..619ad80c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -12,7 +12,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150215121248) do +ActiveRecord::Schema.define(version: 20150215151059) do create_table "active_admin_comments", force: :cascade do |t| t.string "namespace", limit: 255 @@ -85,14 +85,6 @@ ActiveRecord::Schema.define(version: 20150215121248) do add_index "events", ["start_time", "end_time"], name: "events_date" - create_table "lugs", force: :cascade do |t| - t.integer "region_id", default: 0, null: false - t.integer "department", default: 0, null: false - t.string "name", limit: 255, default: "", null: false - t.string "url", limit: 255, default: "", null: false - t.string "city", limit: 255, default: "", null: false - end - create_table "notes", force: :cascade do |t| t.text "contents", null: false t.datetime "date", null: false @@ -100,6 +92,14 @@ ActiveRecord::Schema.define(version: 20150215121248) do t.integer "author_id" end + create_table "orgas", force: :cascade do |t| + t.integer "region_id", default: 0, null: false + t.integer "department", default: 0, null: false + t.string "name", limit: 255, default: "", null: false + t.string "url", limit: 255, default: "", null: false + t.string "city", limit: 255, default: "", null: false + end + create_table "regions", force: :cascade do |t| t.string "name", limit: 255, default: "", null: false end diff --git a/db/schema_cache.dump b/db/schema_cache.dump new file mode 100644 index 0000000000000000000000000000000000000000..c4934c135ebdc5fef4761f1ffac50bc70308038f GIT binary patch literal 7970 zcmb_hPl()P6yGnD-TA+}({)>0D>b6l*2=hTRT7j}`_Eu0wjB}N!;nqBou&m$<)(MUh>}ez5l=W zc2DIcY2&o!89Vd})oe$Xq%*c9Wt*=4fEmr5af3fGXmWp)bmdU1=FK z)%AMb?IE?L!)ZBPBubKEd9+WRDtr)IE3M+!g;)c*&7zo|l@S z(`|KRqV)CXXK#CC`F88r@={%{C}N9gfu6mAP^(%6{ zBR4v7(;)xKdlhkYM|HGos&i!H)Tu{(p=(|Fo{qd8pIP0q_1n>LhtkIdX6w>hUM#o6 zq*gs76-rxisB4cLjrIbs$W>U|_%9wRobExW3y{86-LSH^mWZbj(QP&vIw1JyC zl076B-fDR?WbYH%@EFsim`M>=f?ON9n3_!9W;=?vFm=#LP2Ut;WSQ+%*P<7p#ST*Jmb1w!6^1EwJ3wPT!`c}^`dm}3h3lQ@`h?ZBx#ZK0Y+Q@O(g(E3ZWX*E)n#pS8 zJe>Qo#~Q5F;K71%ey?Z zT~9SNTaS(|2&GH{v<%Co*tbitEIZirY^xMc(^Ngf8%3ws()~rH@4RWNNn7Iw zl2V!AuH2v@kl7VCWH@R&syT{I$vQXl?OuixoT1I>hJAAiQ^Rn3L&w$vMRtLu&)K#~ zRV$4E8e0L?=VX`-JHodAu-?JIPMY~#_N|#VBH1bCEv#70yJ_L`V+gD$t~YO`Y;7A( zd2U5qcl|M@H!%7R7txDRL^pO2QDLA@w<81Gta7ORASo)5i2u9GWP=t@L`U~soU|rF zjv&Ay$bncgVr05)&eas_D56YpTVY44TP8O;Os|OTn5jHOZ!unkawQ6|e@A2~e^|qB zCE?UmwdH+rx*OyUYb)`j_Qb~1#m%o26jH>x-(G@vJ2+3g)v$+8t-*ywVnwH}<`_fP z1;XUW7RpR7Tt+D4;P4)eJk>&&mtkt+1YVM*icoJ_lPFZF6?D^y!QwOKaC_75Wy!Gx zL0!yP898&!TYjjiS~Orxn7{M0TFV`6;SK~l-SnbXz&$`@iKUW81K!NK#-(xc!XSTS z-K98+&82Hw4|hN%V`$B{k;^K7NzV1qKDer2!*m=>sdDfTs|G94-sZ$caWPnr9hDXZ z!Vxl)fQG8;I1c;uVLFh>B6|5iT)+H{P|e5fe#~SSOgYRhZ1^{vz_N-dbEB8;u2Vw^ zQIYNR)w@8Q^XK@oPKQ{(*e)~7o2l20DspL%9Wl;Z9!i(M32R#f2jf<}f`xi^g$Zp$ zJ<);@)-kT*Enm=e;eaCMH-B&l1*K*kIL!7~!Im#-zVL`5W_ltVMN)b@29M`AU}L;i zh`itg#!bB1f+rPmmvt3Lin!|v3Z7NO3Ckrot%$p=j^Hd>AX?1CC=D*)MY5ZhVBrHV zC}Mi264EafumtNCxSVAP>D{~qU(Q?b6$BH>ie%hOjMqc=MyMRNaOULp8L*9#(mM*c zj($z8AYgzWr8f*PMEJ=s5Wq#Q)Zh;{`PqJ4OD^;p^72DFyn#22#&RI9<7^xpd#FMvpg~{6m1Me7h|!b^7C1CSpvmttaEC&*8z6(h%BAIQ%kI|t^0{DKN`I338Z`TQWirJ(irAgAWdeB@9T2=^f&kDWj`jPxRG1j2*(rWpHx@GyH< z2xdSyitl)w0>W{mq>F>lK~knX2q%%20}&uRh2#Vz@Tns_!=z+v3`om#b`Z`YF{ydN z^Z1w;{UUoA`%QR}Ozxd==;T`z_lm2%95vZ(azuXT$B}beIqqFjN;qQi=7V2ha37~~ zmZNh6C`V1~9}_1V342ubKUhfOjDk;zG4O#m0zT%HXWz&56Ca9|#TRiB;O~@@_{=GX JPl;09{{TMg_&)#u literal 0 HcmV?d00001 diff --git a/test/controllers/lugs_controller_test.rb b/test/controllers/orgas_controller_test.rb similarity index 68% rename from test/controllers/lugs_controller_test.rb rename to test/controllers/orgas_controller_test.rb index 0407ee0e..e023fbb6 100644 --- a/test/controllers/lugs_controller_test.rb +++ b/test/controllers/orgas_controller_test.rb @@ -1,9 +1,9 @@ require 'test_helper' # Free Software groups life cycle -class LugsControllerTest < ActionController::TestCase +class OrgasControllerTest < ActionController::TestCase setup do - @lug = lugs :one + @orga = orgas :one end test 'should get index' do @@ -12,7 +12,7 @@ class LugsControllerTest < ActionController::TestCase end test 'should get show' do - get :show, id: @lug + get :show, id: @orga assert_response :success end end diff --git a/test/fixtures/lugs.yml b/test/fixtures/orgas.yml similarity index 100% rename from test/fixtures/lugs.yml rename to test/fixtures/orgas.yml diff --git a/test/helpers/lugs_helper_test.rb b/test/helpers/lugs_helper_test.rb deleted file mode 100644 index 6b22e97b..00000000 --- a/test/helpers/lugs_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class LugsHelperTest < ActionView::TestCase -end diff --git a/test/helpers/orgas_helper_test.rb b/test/helpers/orgas_helper_test.rb new file mode 100644 index 00000000..d41e95c8 --- /dev/null +++ b/test/helpers/orgas_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class OrgasHelperTest < ActionView::TestCase +end diff --git a/test/models/lug_test.rb b/test/models/orga_test.rb similarity index 65% rename from test/models/lug_test.rb rename to test/models/orga_test.rb index b6c69d10..38981707 100644 --- a/test/models/lug_test.rb +++ b/test/models/orga_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class LugTest < ActiveSupport::TestCase +class OrgaTest < ActiveSupport::TestCase # test "the truth" do # assert true # end