From c8fb2ab06954505e532eb8d40d85562708b0ba7e Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 30 Oct 2013 13:01:59 +0100 Subject: [PATCH] update git environment --- .gitignore | 4 ++ config/initializers/devise.rb | 4 +- .../supplier/supplier_main_board_steps.rb | 28 -------- features/supplier/main_board.feature | 24 ------- features/support/basics.rb | 33 --------- features/support/env.rb | 69 ------------------- 6 files changed, 6 insertions(+), 156 deletions(-) delete mode 100644 features/step_definitions/supplier/supplier_main_board_steps.rb delete mode 100644 features/supplier/main_board.feature delete mode 100644 features/support/basics.rb delete mode 100644 features/support/env.rb diff --git a/.gitignore b/.gitignore index e674de6e..b487dc0c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ public/google* replication_design.html .DS_Store stories.html +zeus.json +custom_plan.rb +public/capybara.html +chromedriver.log diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 3d2eedce..46ce5a06 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 = 'please-change-me-at-config-initializers-devise@example.com' + config.mailer_sender = 'service@qwaiter.com' # Configure the class responsible to send e-mails. # config.mailer = 'Devise::Mailer' @@ -138,7 +138,7 @@ Devise.setup do |config| # ==> Configuration for :validatable # Range for password length. Default is 8..128. - config.password_length = 8..128 + config.password_length = 6..30 # Email regex used to validate email formats. It simply asserts that # one (and only one) @ exists in the given string. This is mainly diff --git a/features/step_definitions/supplier/supplier_main_board_steps.rb b/features/step_definitions/supplier/supplier_main_board_steps.rb deleted file mode 100644 index e4587d91..00000000 --- a/features/step_definitions/supplier/supplier_main_board_steps.rb +++ /dev/null @@ -1,28 +0,0 @@ -Given(/^there is an active list$/) do - create_confirmed_supplier 'supplier@qwaiter.com' - create_user 'user@qwaiter.com' - @table = FactoryGirl.create :table, supplier: @supplier - @list = FactoryGirl.create :list, supplier: @supplier, table: @table, user_ids: [@user.id] -end - -Given(/^I am on the main board$/) do - visit '/supplier' - sleep 0.1 -end - -And(/^I am signed in$/) do - login_supplier_as 'supplier@qwaiter.com' -end - -And(/^an order is placed$/) do - product = FactoryGirl.create :product, supplier: @supplier - sleep 0.1 - @list.place_order @user, {product.id => 369} -end -Then(/^there is a list record for the active list$/) do - page.should have_selector "#list-row-#{@list.id}" -end - -Then(/^there should be a record of the active order$/) do - page.should have_selector ".of-list-#{@list.id}" -end diff --git a/features/supplier/main_board.feature b/features/supplier/main_board.feature deleted file mode 100644 index 71b3e914..00000000 --- a/features/supplier/main_board.feature +++ /dev/null @@ -1,24 +0,0 @@ -Feature: Supplier main board - - @javascript - Scenario: the active list should be present and contained in row having its id - Given there is an active list - And I am signed in - And I am on the main board - Then there is a list record for the active list - - @javascript - Scenario: an order is added to the list before visiting the page - Given there is an active list - And I am signed in - And an order is placed - And I am on the main board - Then there should be a record of the active order - - @javascript - Scenario: an order is added to the list after visiting the page - Given there is an active list - And I am signed in - And I am on the main board - And an order is placed - Then there should be a record of the active order diff --git a/features/support/basics.rb b/features/support/basics.rb deleted file mode 100644 index 9dcdf3c7..00000000 --- a/features/support/basics.rb +++ /dev/null @@ -1,33 +0,0 @@ -module BasicsHelper - def create_user(email, password='secret') - @user = User.find_by_email(email) || FactoryGirl.create(:user, email: email, password: password) - end - def create_supplier(email, password='secret') - @supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, email: email, password: password) - end - - def create_confirmed_supplier(email, password='secret') - @supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, :confirmed, email: email, password: password) - @supplier.confirm! unless @supplier.confirmed? - end - - def login_user_as(email) - visit "/users/sign_in" - fill_in "user_email", with: email - fill_in "user_password", with: "secret" - submit_form - end - - def login_supplier_as(email) - visit "/suppliers/sign_in" - fill_in "supplier_email", with: email - fill_in "supplier_password", with: "secret" - submit_form - end - - def submit_form - find("[type=submit]").click - end -end - -World(BasicsHelper) diff --git a/features/support/env.rb b/features/support/env.rb deleted file mode 100644 index bd70d39f..00000000 --- a/features/support/env.rb +++ /dev/null @@ -1,69 +0,0 @@ -# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril. -# It is recommended to regenerate this file in the future when you upgrade to a -# newer version of cucumber-rails. Consider adding your own code to a new file -# instead of editing this one. Cucumber will automatically load all features/**/*.rb -# files. - -require 'cucumber/rails' -require 'capybara/poltergeist' -poltergeist = false -# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In -# order to ease the transition to Capybara we set the default here. If you'd -# prefer to use XPath just remove this line and adjust any selectors in your -# steps to use the XPath syntax. -Capybara.default_selector = :css -if poltergeist - Capybara.javascript_driver = :poltergeist -else - Capybara.register_driver :selenium do |app| - #Capybara::Selenium::Driver.new(app, :browser => :chrome) - Capybara::Selenium::Driver.new(app, :browser => :firefox) - end -end - -# By default, any exception happening in your Rails application will bubble up -# to Cucumber so that your scenario will fail. This is a different from how -# your application behaves in the production environment, where an error page will -# be rendered instead. -# -# Sometimes we want to override this default behaviour and allow Rails to rescue -# exceptions and display an error page (just like when the app is running in production). -# Typical scenarios where you want to do this is when you test your error pages. -# There are two ways to allow Rails to rescue exceptions: -# -# 1) Tag your scenario (or feature) with @allow-rescue -# -# 2) Set the value below to true. Beware that doing this globally is not -# recommended as it will mask a lot of errors for you! -# -ActionController::Base.allow_rescue = false - -# Remove/comment out the lines below if your app doesn't have a database. -# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead. -begin - #DatabaseCleaner.strategy = :transaction - DatabaseCleaner.strategy = :truncation -rescue NameError - raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it." -end - -# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios. -# See the DatabaseCleaner documentation for details. Example: -# -# Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do -# # { :except => [:widgets] } may not do what you expect here -# # as tCucumber::Rails::Database.javascript_strategy overrides -# # this setting. -# DatabaseCleaner.strategy = :truncation -# end -# -# Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do -# DatabaseCleaner.strategy = :transaction -# end -# - -# Possible values are :truncation and :transaction -# The :transaction strategy is faster, but might give you threading problems. -# See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature -Cucumber::Rails::Database.javascript_strategy = :truncation -