diff --git a/app/assets/images/frames/.DS_Store b/app/assets/images/frames/.DS_Store deleted file mode 100644 index 71e58fc6..00000000 Binary files a/app/assets/images/frames/.DS_Store and /dev/null differ diff --git a/app/assets/images/icons/logo-text.png b/app/assets/images/icons/logo-text.png index 9816e765..41f04f90 100644 Binary files a/app/assets/images/icons/logo-text.png and b/app/assets/images/icons/logo-text.png differ diff --git a/app/assets/images/logo-big.png b/app/assets/images/logo-big.png index bee59fa9..4f595c44 100644 Binary files a/app/assets/images/logo-big.png and b/app/assets/images/logo-big.png differ diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index 075f7f4f..34e11ae1 100644 Binary files a/app/assets/images/logo.png and b/app/assets/images/logo.png differ diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg index 58a86795..a8e2f734 100644 --- a/app/assets/images/logo.svg +++ b/app/assets/images/logo.svg @@ -23,7 +23,7 @@ sodipodi:docname="logo.svg">image/svg+xml @@ -117,6 +117,69 @@ x="0" y="0" width="8503.9404" + height="8503.9404" />QWAITER + + +MOZO +.BAR +MOZO.BAR \ No newline at end of file diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 07aed8a2..884d91b0 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -26,7 +26,7 @@ class DashboardController < ApplicationController def table_qr_image @table = Table.find(params[:table_id]) #code = [get_the_app_url, {table_id: @table.id}.to_json].join('?') - code = "q.qwaiter.com/s?t=#{@table.id}" + code = "q.mozo.bar/s?t=#{@table.id}" size = RQRCode.minimum_qr_size_from_string(code) respond_to do |format| format.html @@ -46,7 +46,7 @@ class DashboardController < ApplicationController end def qr - code = 'qwaiter.com' + code = 'mozo.bar' respond_to do |format| format.html format.png { render qrcode: code, level: :h, unit: 10, size: 7} diff --git a/app/mailers/supplier_mailer.rb b/app/mailers/supplier_mailer.rb index a5ffbc9b..210a3be7 100644 --- a/app/mailers/supplier_mailer.rb +++ b/app/mailers/supplier_mailer.rb @@ -1,5 +1,5 @@ class SupplierMailer < ActionMailer::Base - default from: "Qwaiter " + default from: "Qwaiter " layout 'mail' def creation(supplier) diff --git a/app/views/dashboard/about.html.slim b/app/views/dashboard/about.html.slim index 58324a5b..1524957a 100644 --- a/app/views/dashboard/about.html.slim +++ b/app/views/dashboard/about.html.slim @@ -1,31 +1,31 @@ - title t('menu.about') = image_tag 'icons/logo-big.png', style: 'float: right' p - | - Qwaiter is een systeem om bestellingen te doen met je smartphone. - Als je wel eens op een terras of een afgelegen deel van een horeca gelegenheid + | + Mozo.bar een systeem om bestellingen te doen met je smartphone. + Als je wel eens op een terras of een afgelegen deel van een horeca gelegenheid hebt gezeten en vond dat het te lang duurde voordat er iemand aan je kwam vragen wat je wil bestellen dan weet je dat er nog veel te verbeteren is. p | Om horeca gelegenheden te helpen de vraag van klanten beter te kunnen verwerken - is Qwaiter ontstaan. Qwaiter is een toevoeging voor horeca gelegenheden om klanten - met hun smartphone te laten bestellen. Dit is de focus van Qwaiter! Om het gemak - en de sfeer waar mensen aan gewend zijn te handhaven integreert Qwaiter zo goed + is mozo.bar ontstaan. mozo.bar is een toevoeging voor horeca gelegenheden om klanten + met hun smartphone te laten bestellen. Dit is de focus van mozo.bar! Om het gemak + en de sfeer waar mensen aan gewend zijn te handhaven integreert mozo.bar zo goed mogelijk met de ervaring van mensen. Klanten kunnen gewoon op een lijstje bestellen en bij ondersteunde systemen komt de bestelling gewoon achter de bar of in de keuken uitgeprint. p ' - Qwaiter is gratis om in gebruik te nemen en in een handomdraai toegevoegd als extra dienst. - Maak als horeca gelegenheid een - =' link_to 'account', new_supplier_registration_path + Mozo.bar is gratis om in gebruik te nemen en in een handomdraai toegevoegd als extra dienst. + Maak als horeca gelegenheid een + =' link_to 'account', new_supplier_registration_path | aan. Richt deze in en je kan aan de slag! p ' Heb je een ervaring of idee waardoor we de ervaring voor zowel de horeca bezoeker als de horeca gelegenheid kunnen verbeteren mail dit dan naar: - =' mail_to 'ervaringe@qwaiter.com' + =' mail_to 'experiance@mozo.bar' | dan kunnen wij ervoor zorgen dat het gaan naar een horeca gelegenheid leuk en makkelijk wordt! diff --git a/app/views/dashboard/bars_restaurants.html.slim b/app/views/dashboard/bars_restaurants.html.slim index d4e71b64..59fe900d 100644 --- a/app/views/dashboard/bars_restaurants.html.slim +++ b/app/views/dashboard/bars_restaurants.html.slim @@ -1,10 +1,10 @@ - title t('menu.bars_restaurants') .right= image_tag 'site/tablet-screenshot.png' p - | - Qwaiter is niet alleen handig voor de gebruiker die met zijn of haar smartphone makkelijk kan bestellen. + | + Mozo.bar is niet alleen handig voor de gebruiker die met zijn of haar smartphone makkelijk kan bestellen. Ook voor de bar of restauranthouder is het een ware toevoeging. Door tevreden klanten en minder en efficientere - Handelingen wordt er veel bespaard en gaat alles een stuk sneller. Een tablet of ander apparaat met - internet verbinding is voldoende om Qwaiter in gebruik te nemen. + Handelingen wordt er veel bespaard en gaat alles een stuk sneller. Een tablet of ander apparaat met + internet verbinding is voldoende om mozo.bar in gebruik te nemen. h3= link_to 'Log in als bar of restaurant', supplier_root_path h3= link_to 'Meld je aan als bar of restaurant', new_supplier_registration_path diff --git a/app/views/dashboard/cartoon.html.slim b/app/views/dashboard/cartoon.html.slim index ac24bf0c..d93bd196 100644 --- a/app/views/dashboard/cartoon.html.slim +++ b/app/views/dashboard/cartoon.html.slim @@ -5,14 +5,14 @@ 3 => "Lets order a beer with my phone in stead! Much faster!", \ 4 => "Now I can do things I like!!!!!", \ 5 => "Relaxt, I get my beer as ordered", \ - 6 => "Qwaiter rocks!!!!" \ + 6 => "Mozo.bar rocks!!!!" \ }, nl: {\ 1 => "Ik heb zin in een pilsje!!", \ 2 => "Waar is de ober?", \ 3 => "Laten we dan maar met mijn mobiel bestellen, dat is veel sneller!!", \ 4 => "Nu kan ik tenminste dingen doen die ik leuk vind!!!!!", \ 5 => "Relaxt, ik krijg mijn pilsje zoals besteld!", \ - 6 => "Qwaiter rocks!!!!" \ + 6 => "Mozo.bar rocks!!!!" \ }\ } ul#cartoon @@ -21,4 +21,3 @@ ul#cartoon .cartoon-image= image_tag "cartoon/qwaiter-cartoon-#{i}.png" .cartoon-text= cartoon_text[I18n.locale][i] .clearing - diff --git a/app/views/dashboard/clients.html.slim b/app/views/dashboard/clients.html.slim index e9d61621..29cc4312 100644 --- a/app/views/dashboard/clients.html.slim +++ b/app/views/dashboard/clients.html.slim @@ -2,11 +2,11 @@ .right= image_tag 'site/phone-screenshot.png' p | - Qwaiter is een app voor je telefoon die het bestellen van drankjes en hapjes in bars en restaurant snel en eenvoudig maakt. - Scan een QR code, kies wat je wilt hebben, en krijg je bestelling. Zo simpel is het! + Mozo.bar is een app voor je telefoon die het bestellen van drankjes en hapjes in bars en restaurant snel en eenvoudig maakt. + Scan een QR code, kies wat je wilt hebben, en krijg je bestelling. Zo simpel is het! p | - Qwaiter is momenteel nog in een opstartfase. Om de gebruikerservaring zo optimaal mogelijk te krijgen vragen we je om de + Mozo.bar is momenteel nog in een opstartfase. Om de gebruikerservaring zo optimaal mogelijk te krijgen vragen we je om de = link_to t('menu.enquete'), enquete_path | in te vullen. Dit kost je 2 minuten en wij zijn er erg blij mee. .clearing diff --git a/app/views/dashboard/contact.html.slim b/app/views/dashboard/contact.html.slim index fed1ab2c..dbca926d 100644 --- a/app/views/dashboard/contact.html.slim +++ b/app/views/dashboard/contact.html.slim @@ -1,4 +1,4 @@ - title t('menu.contact') p - |Qwaiter is in een alpha fase. Dit houdt in dat hij nog niet officieel is en er nog veel onvolkomenheden in zitten. Heb je echter al vragen of opmerkingen stuur deze dan naar: - = mail_to 'info@qwaiter.com' + |Mozo.bar is in een alpha fase. Dit houdt in dat hij nog niet officieel is en er nog veel onvolkomenheden in zitten. Heb je echter al vragen of opmerkingen stuur deze dan naar: + = mail_to 'info@mozo.bar' diff --git a/app/views/layouts/administrator.html.slim b/app/views/layouts/administrator.html.slim index c9381254..7a50cd50 100644 --- a/app/views/layouts/administrator.html.slim +++ b/app/views/layouts/administrator.html.slim @@ -65,7 +65,7 @@ html lang="en" hr ul.side-nav li.heading Links - li= link_to "Qwaiter website", root_path + li= link_to "Mozo.bar website", root_path li= link_to "Companytools", 'http://www.companytools.nl/' = yield :sidebar footer diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 68e5b868..b73527ad 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -28,9 +28,9 @@ html lang="en" #header #header-right .social - a.wsite-social-facebook href="https://www.facebook.com/Qwaiter" target=:_blank + a.wsite-social-facebook href="https://www.facebook.com/mozo.bar" target=:_blank span.wsite-social-inner - a.wsite-social-twitter href="https://twitter.com/qwaiter" target=:_blank + a.wsite-social-twitter href="https://twitter.com/mozo.bar" target=:_blank span.wsite-social-inner a.wsite-social-linkedin href="http://www.linkedin.com/company/579750" target=:_blank span.wsite-social-inner diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim index 10790e00..83517676 100644 --- a/app/views/layouts/phone.html.slim +++ b/app/views/layouts/phone.html.slim @@ -11,22 +11,18 @@ html lang="en" /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = stylesheet_link_tag "user/wood1/application", :media => "all" - link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144" - link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114" - link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72" - link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed" link href="/favicon.ico" rel="shortcut icon" - if ENV['QWAITER_MOBILE_EXPORT'] == 'yes' javascript: var QMobile, Qwaiter, Quser; - var data_host = 'http://data.qwaiter.com'; + var data_host = 'http://data.mozo.bar'; var event_host = '#{Qwaiter.event_host}'; var $asset_path = '##assets_path##'; var Qstorage = localStorage; - else javascript: var QMobile, Qwaiter, Quser; - var data_host = 'http://data.qwaiter.com'; + var data_host = 'http://data.mozo.bar'; var event_host = '#{Qwaiter.event_host}'; var $asset_path = '/assets/'; var Qstorage = localStorage; @@ -42,7 +38,6 @@ html lang="en" this.authentication_string_storage = 'auth_token='+token; this.authentication_object_storage = '{"auth_token": "'+token+'"}' }, - root_url: function(){return 'file:///Users/bterkuile/Documents/workspace/Qwaiter/assets/user'}, root_url: function(){return '/user'}, goHome: function(){ redirect_to('user_root')}, connection_problem: function(){alert('There is a problem connecting to the server')}, @@ -63,15 +58,15 @@ html lang="en" = link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand .container.nav-collapse ul.nav#top-navigation-list - li.locale.locale-en= link_to_function 'English', %|setLocale('en')| - li.locale.locale-nl= link_to_function 'Nederlands', %|setLocale('nl')| + li.locale.locale-en= link_to_function 'English', %|setLocale('en')| + li.locale.locale-nl= link_to_function 'Nederlands', %|setLocale('nl')| li= link_to t('user.list_history.title'), user_list_history_path, data: {t: 'list_history.title'} a#toggle-side-menu href="#" span.fa.fa-bars.fa-lg #side-menu-container ul - li.locale-select.locale-select-en= link_to_function 'English', %|setLocale('en')| - li.locale-select.locale-select-nl= link_to_function 'Nederlands', %|setLocale('nl')| + li.locale-select.locale-select-en= link_to_function 'English', %|setLocale('en')| + li.locale-select.locale-select-nl= link_to_function 'Nederlands', %|setLocale('nl')| li= link_to t('user.list_history.title'), user_list_history_path, data: {t: 'list_history.title'} .container .content diff --git a/app/views/layouts/theme1-home.html.slim b/app/views/layouts/theme1-home.html.slim index d0a3423b..c9f15410 100644 --- a/app/views/layouts/theme1-home.html.slim +++ b/app/views/layouts/theme1-home.html.slim @@ -59,4 +59,4 @@ html lang="en" .footer-shadow .container .footer-content= render 'footer' - .footer-bottom © Qwaiter 2014 + .footer-bottom © mozo.bar 2014 diff --git a/app/views/layouts/theme1.html.slim b/app/views/layouts/theme1.html.slim index 2d0bb628..9b00a6e6 100644 --- a/app/views/layouts/theme1.html.slim +++ b/app/views/layouts/theme1.html.slim @@ -54,5 +54,5 @@ html lang="en" .footer-shadow .container .footer-content= render 'footer' - .footer-bottom © Qwaiter 2013 + .footer-bottom © mozo.bar 2014 = javascript_include_tag "theme1/application" diff --git a/app/views/layouts/user/foundation.html.slim b/app/views/layouts/user/foundation.html.slim index e77fddf0..58f2228e 100644 --- a/app/views/layouts/user/foundation.html.slim +++ b/app/views/layouts/user/foundation.html.slim @@ -12,11 +12,11 @@ html lang="en" - if ENV['QWAITER_MOBILE_EXPORT'] == 'yes' javascript: var QMobile, Qwaiter, Quser; - var $data_host = 'http://data.qwaiter.com'; + var $data_host = 'http://data.mozo.bar'; var $event_host = '#{Qwaiter.event_host}'; var $asset_path = '##assets_path##'; var Qstorage = localStorage; - var $root_url = 'http://www.qwaiter.com/user'; + var $root_url = 'http://www.mozo.bar/user'; - else javascript: var QMobile, Qwaiter, Quser; diff --git a/app/views/supplier_mailer/creation.html.slim b/app/views/supplier_mailer/creation.html.slim index 27d800f3..744490f5 100644 --- a/app/views/supplier_mailer/creation.html.slim +++ b/app/views/supplier_mailer/creation.html.slim @@ -3,7 +3,7 @@ p | Welkom bij Qwaiter! Leuk dat je gebruik wil maken van bestellen via de smartphone. De eerste stap is gezet! Maak je gebruik van een reeds bestaand kassasysteem dan is de kans groot dat Qwaiter deze ondersteunt. Selecteer in - dit geval eerst je kassasysteem. De inrichting van Qwaiter zich hierop zal + dit geval eerst je kassasysteem. De inrichting van Qwaiter zich hierop zal aanpassen. p | @@ -16,5 +16,4 @@ p br | Qwaiter br - = link_to 'www.Qwaiter.com', root_url, style: "color:#FAA732" - + = link_to 'mozo.bar', root_url, style: "color:#FAA732" diff --git a/bin/build_mobile_app.rb b/bin/build_mobile_app.rb index c58019ee..68c3ed75 100644 --- a/bin/build_mobile_app.rb +++ b/bin/build_mobile_app.rb @@ -88,8 +88,8 @@ for action in uc.action_methods android_view.sub! /<\/title>/, '' android_view.gsub! '##assets_path##', 'file:///android_asset/assets/' if testhost = ENV['TEST_HOST'].presence - android_view.gsub! /data.qwaiter.com|www.qwaiter.com/, "#{testhost}:3000" - android_view.gsub! /events.qwaiter.com/, "#{testhost}:9296" + android_view.gsub! /data.mozo.bar|www.mozo.bar/, "#{testhost}:3000" + android_view.gsub! /events.mozo.bar/, "#{testhost}:9296" end # write to android path File.open(File.join(android_root, "#{action}.html"), 'w'){|f| f.puts android_view} diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 2be87855..59f4cbfc 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -4,9 +4,9 @@ # is considered to be the first unless any hosts have the primary # property set. Don't declare `role :all`, it's a meta role. -role :app, %w{root@deploy.qwaiter.com} -role :web, %w{root@deploy.qwaiter.com} -role :db, %w{root@deploy.qwaiter.com} +role :app, %w{root@deploy.mozo.bar} +role :web, %w{root@deploy.mozo.bar} +role :db, %w{root@deploy.mozo.bar} # Extended Server Syntax @@ -15,7 +15,7 @@ role :db, %w{root@deploy.qwaiter.com} # server list. The second argument is a, or duck-types, Hash and is # used to set extended properties on the server. -server 'deploy.qwaiter.com', user: 'root', roles: %w{web app}, my_property: :my_value +server 'deploy.mozo.bar', user: 'root', roles: %w{web app}, my_property: :my_value # Custom SSH Options @@ -33,7 +33,7 @@ server 'deploy.qwaiter.com', user: 'root', roles: %w{web app}, my_property: :my_ # # And/or per server (overrides global) # ------------------------------------ -# server 'qwaiter.com', +# server 'mozo.bar', # user: 'user_name', # roles: %w{web app}, # ssh_options: { diff --git a/config/environments/production.rb b/config/environments/production.rb index 036deb92..3789f18c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -61,7 +61,7 @@ Qwaiter::Application.configure do # Disable delivery errors, bad email addresses will be ignored config.action_mailer.raise_delivery_errors = false config.action_mailer.default_url_options = { - host: 'www.qwaiter.com' + host: 'www.mozo.bar' } config.action_mailer.smtp_settings = { address: "smtp.gmail.com", diff --git a/config/environments/test.rb b/config/environments/test.rb index f22e196a..2faaf24c 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -36,7 +36,7 @@ Qwaiter::Application.configure do # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.default_url_options = { - host: 'www.qwaiter.com' + host: 'www.mozo.bar' } config.action_mailer.delivery_method = :test diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 07a0811b..339b34ec 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -10,7 +10,7 @@ Devise.setup do |config| # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class # with default "from" parameter. - config.mailer_sender = 'service@qwaiter.com' + config.mailer_sender = 'service@mozo.bar' # Configure the class responsible to send e-mails. # config.mailer = 'Devise::Mailer' diff --git a/config/initializers/qwaiter_settings.rb b/config/initializers/qwaiter_settings.rb index f8734c4c..787c2faf 100644 --- a/config/initializers/qwaiter_settings.rb +++ b/config/initializers/qwaiter_settings.rb @@ -1,4 +1,4 @@ -Qwaiter.event_host = "http://#{Rails.env.production? ? 'events.qwaiter.com' : 'localhost'}:9296/faye" +Qwaiter.event_host = "http://#{Rails.env.production? ? 'events.mozo.bar' : 'localhost'}:9296/faye" Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new # use the connection from couchbase-structures/documents diff --git a/lib/generators/bj_controller/spec/templates/controller_spec.rb b/lib/generators/bj_controller/spec/templates/controller_spec.rb index 375d9fda..895b43e1 100644 --- a/lib/generators/bj_controller/spec/templates/controller_spec.rb +++ b/lib/generators/bj_controller/spec/templates/controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe <%= controller_class_name %> do before :each do - @administrator = Administrator.find_by_email('administrator@qwaiter.com') || Administrator.create(email: 'administrator@qwaiter.com', password: 'secret') + @administrator = Administrator.find_by_email('administrator@mozo.bar') || Administrator.create(email: 'administrator@mozo.bar', password: 'secret') sign_in @administrator end diff --git a/spec/acceptance_steps/global_steps.rb b/spec/acceptance_steps/global_steps.rb index e47d7de0..ea311c5e 100644 --- a/spec/acceptance_steps/global_steps.rb +++ b/spec/acceptance_steps/global_steps.rb @@ -1,7 +1,7 @@ step "there is a fresh database with a user and supplier" do CouchPotato.couchrest_database.recreate! - create_confirmed_supplier 'supplier@qwaiter.com' - create_user 'user@qwaiter.com' + create_confirmed_supplier 'supplier@mozo.bar' + create_user 'user@mozo.bar' end step "I click on translation :translation" do |translation_key| diff --git a/spec/acceptance_steps/suppliers/existance_steps.rb b/spec/acceptance_steps/suppliers/existance_steps.rb index cdfad701..721ce77f 100644 --- a/spec/acceptance_steps/suppliers/existance_steps.rb +++ b/spec/acceptance_steps/suppliers/existance_steps.rb @@ -1,5 +1,5 @@ step 'there is a confirmed and open supplier' do @supplier_password = 'secret1' - @supplier = create :supplier, email: 'supplier@qwaiter.com', password: @supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true + @supplier = create :supplier, email: 'supplier@mozo.bar', password: @supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true @section = create :section, title: 'Room', supplier: @supplier, width: 8, height: 8 end diff --git a/spec/acceptance_steps/suppliers/settings_steps.rb b/spec/acceptance_steps/suppliers/settings_steps.rb index f260ecc6..90d1449a 100644 --- a/spec/acceptance_steps/suppliers/settings_steps.rb +++ b/spec/acceptance_steps/suppliers/settings_steps.rb @@ -1,5 +1,5 @@ step "I provide a new supplier email address" do - find('.supplier-email').set 'new-supplier-mail@qwaiter.com' + find('.supplier-email').set 'new-supplier-mail@mozo.bar' end step "the supplier submits the supplier settings form" do @@ -9,20 +9,20 @@ end step "the supplier email should not have been changed" do @supplier.reload - @supplier.email.should == 'supplier@qwaiter.com' + @supplier.email.should == 'supplier@mozo.bar' end step "the supplier unconfirmed email should have been set to the new supplier email" do @supplier.reload - @supplier.unconfirmed_email.should == 'new-supplier-mail@qwaiter.com' + @supplier.unconfirmed_email.should == 'new-supplier-mail@mozo.bar' end step "an email should have been sent to the original supplier email with email confirmation instructions" do mail = ActionMailer::Base.deliveries.last - mail.to.should == ['supplier@qwaiter.com'] + mail.to.should == ['supplier@mozo.bar'] mail.body.should include I18n.t('devise.mailer.confirmation_instructions.supplier.salutation', email: @supplier.email) mail.body.should_not include 'translation' # indicating a translation issue - confirmation_link_match = mail.body.match(/http:\/\/www.qwaiter.com(\/suppliers\/confirmation[^"]+)"/) + confirmation_link_match = mail.body.match(/http:\/\/www.mozo.bar(\/suppliers\/confirmation[^"]+)"/) confirmation_link_match.should be_present @confirmation_link = confirmation_link_match[1] end @@ -37,7 +37,7 @@ end step "the supplier email is the new email and the unconfirmed email is empty" do @supplier.reload - @supplier.email.should == 'new-supplier-mail@qwaiter.com' + @supplier.email.should == 'new-supplier-mail@mozo.bar' @supplier.unconfirmed_email.should be_blank end diff --git a/spec/controllers/supplier/edit_spec.rb b/spec/controllers/supplier/edit_spec.rb index c83a3c81..5d695683 100644 --- a/spec/controllers/supplier/edit_spec.rb +++ b/spec/controllers/supplier/edit_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe SupplierController, type: :controller do before :each do - @supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret') + @supplier = Supplier.find_by_email('supplier@mozo.bar') || Supplier.create(name: 'Supplier', email: 'supplier@mozo.bar', password: 'secret') sign_in @supplier end diff --git a/spec/controllers/suppliers/lists_controller_spec.rb b/spec/controllers/suppliers/lists_controller_spec.rb index 9c5e331f..12ab5969 100644 --- a/spec/controllers/suppliers/lists_controller_spec.rb +++ b/spec/controllers/suppliers/lists_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Suppliers::ListsController, type: :controller do before :each do - @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) + @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed) ActionController::Parameters.permit_all_parameters = false #controller.stub(:list_params){ controller.params.require(:list).permit! } # allow all parameters since cross parameter injection is tested sign_in @supplier diff --git a/spec/controllers/suppliers/product_categories_controller_spec.rb b/spec/controllers/suppliers/product_categories_controller_spec.rb index cc0b5588..6d5b4370 100644 --- a/spec/controllers/suppliers/product_categories_controller_spec.rb +++ b/spec/controllers/suppliers/product_categories_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Suppliers::ProductCategoriesController, type: :controller do before :each do - @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) + @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed) sign_in @supplier end diff --git a/spec/controllers/suppliers/products_controller_spec.rb b/spec/controllers/suppliers/products_controller_spec.rb index fbf8441a..09fbed40 100644 --- a/spec/controllers/suppliers/products_controller_spec.rb +++ b/spec/controllers/suppliers/products_controller_spec.rb @@ -11,7 +11,7 @@ describe Suppliers::ProductsController, type: :controller do end before :each do - @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) + @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed) sign_in @supplier end diff --git a/spec/controllers/suppliers/sections_controller_spec.rb b/spec/controllers/suppliers/sections_controller_spec.rb index 4050452c..00dd2c08 100644 --- a/spec/controllers/suppliers/sections_controller_spec.rb +++ b/spec/controllers/suppliers/sections_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Suppliers::SectionsController, type: :controller do before :each do - @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) + @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed) sign_in @supplier end diff --git a/spec/controllers/suppliers/tables_controller_spec.rb b/spec/controllers/suppliers/tables_controller_spec.rb index 888825b3..129b72c5 100644 --- a/spec/controllers/suppliers/tables_controller_spec.rb +++ b/spec/controllers/suppliers/tables_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Suppliers::TablesController, type: :controller do before :each do - @supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) + @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed) #controller.stub(:table_params){ controller.params.require(:table).permit! } # allow all parameters since cross parameter injection is tested sign_in @supplier end diff --git a/spec/factories/supplier_factory.rb b/spec/factories/supplier_factory.rb index d8e0fce1..662360c6 100644 --- a/spec/factories/supplier_factory.rb +++ b/spec/factories/supplier_factory.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :supplier do sequence(:name){|i| "Supplier #{i}"} - email 'supplier@qwaiter.com' + email 'supplier@mozo.bar' password 'secret' trait :confirmed do diff --git a/spec/models/list/join_requests_spec.rb b/spec/models/list/join_requests_spec.rb index ab12f8dd..58c39e98 100644 --- a/spec/models/list/join_requests_spec.rb +++ b/spec/models/list/join_requests_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe List do let(:supplier) { create :supplier } let(:supplier_password){'secret1'} - let(:supplier) { create :supplier, email: 'supplier@qwaiter.com', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true } + let(:supplier) { create :supplier, email: 'supplier@mozo.bar', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true } let(:user) { create :user } let(:section) { create :section, supplier: supplier} let(:table) { create :table, supplier: supplier} diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb index 98e2d4ce..0d1f3520 100644 --- a/spec/models/list_spec.rb +++ b/spec/models/list_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe List do let(:supplier) { create :supplier } let(:supplier_password){'secret1'} - let(:supplier) { create :supplier, email: 'supplier@qwaiter.com', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true } + let(:supplier) { create :supplier, email: 'supplier@mozo.bar', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true } let(:user) { create :user } let(:section) { create :section, supplier: supplier} let(:table) { create :table, supplier: supplier}