office_clerk 0.5 → 0.6

data/spec/models/clerk/email_spec.rb

@@ -28,8 +28,8 @@ describe Clerk do
   end
 
   it "should reject duplicate email addresses" do
-    create(:clerk , :email => "sama@sama.net")
-    clerk_with_duplicate_email = build(:clerk , :email => "sama@sama.net")
+    create(:clerk , :email => "torsten@villataika.fi")
+    clerk_with_duplicate_email = build(:clerk , :email => "torsten@villataika.fi")
     clerk_with_duplicate_email.save
     expect(clerk_with_duplicate_email).not_to be_valid
   end
@@ -39,8 +39,8 @@ describe Clerk do
     create(:clerk ,:email => upcased_email)
     clerk_with_duplicate_email = build(:clerk , :email => upcased_email.downcase )
     clerk_with_duplicate_email.save
-#should work but doesn, postponed
- #   clerk_with_duplicate_email.not_to be_valid
+#should work but doesn on TRAVIS!!
+#    expect(clerk_with_duplicate_email).not_to be_valid
   end
 
 

data/spec/spec_helper.rb

@@ -9,45 +9,14 @@ require File.expand_path("../../test_app/config/environment",  __FILE__)
 Rails.backtrace_cleaner.remove_silencers!
 
 require 'rspec/rails'
-require 'email_spec'
 
-unless Clerk.where( :email =>  "admin@important.me").first
-  admin = Clerk.new( :email =>  "admin@important.me" , :admin => true , :password => "password" ) 
-   admin.save!
-end
-require "database_cleaner"
-require 'capybara/rspec'
-require 'capybara-screenshot/rspec'
-Capybara::Screenshot.prune_strategy = :keep_last_run
-
-#require 'capybara/poltergeist'
-#Capybara.javascript_driver = :poltergeist
-
-Capybara.default_selector = :css
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-#Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
- 
-RSpec.configure do |config|
-  config.include(EmailSpec::Helpers)
-  config.include(EmailSpec::Matchers)
 
-  config.include PageHelper
-  
-  config.include Capybara::DSL  
+RSpec.configure do |config|
   
   config.include OfficeClerk::Engine.routes.url_helpers
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = false
 
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
   config.infer_spec_type_from_file_location!
   
@@ -57,21 +26,11 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = "random"
 
-  config.before(:suite) do
-    DatabaseCleaner.clean_with :truncation
-    DatabaseCleaner.strategy = :transaction
-  end
-  config.before(:each) do |group|
-    DatabaseCleaner.strategy = :transaction
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
   end
 
-  config.before(:each, :js => true) do
-    DatabaseCleaner.strategy = :truncation
-  end
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+  # Print the 10 slowest examples and example groups at the end of the spec run, 
+  #to help surface which specs are running  particularly slow.
+#  config.profile_examples = 10
 end

data/spec/support/basket_helper.rb

@@ -0,0 +1,9 @@
+module BasketHelper
+  def expect_basket_total price
+    expect(find(".total").text).to include( price.round(2).to_s.sub(".",",")) # TODO remove the format hack 
+  end
+end
+
+RSpec.configure do |config|
+  config.include BasketHelper
+end

data/spec/support/product_helper.rb

@@ -0,0 +1,25 @@
+module ProductHelper
+  def product_count
+    click_button(:filter)
+    all(".image").count
+  end
+  def create_ab type , hash
+    attribute , values = hash.first
+    values.each do | value|
+      create type , attribute => value
+    end
+  end
+  def product_ab hash
+    create_ab :product , hash
+    visit products_path
+  end
+  def category_ab hash
+    create_ab :category , hash
+    visit categories_path
+  end
+  alias :category_count :product_count
+end
+
+RSpec.configure do |config|
+  config.include ProductHelper
+end

data/spec/support/request_helper.rb

@@ -1,4 +1,4 @@
-module PageHelper
+module RequestHelper
   def ensure_path path
     expect(page.current_path).to eq path
   end
@@ -24,8 +24,8 @@ module PageHelper
     click_button I18n.t(:sign_in)
     expect(page).to have_content I18n.t(:baskets)
   end
+end
 
-  def expect_basket_total price
-    expect(find(".total").text).to include( price.round(2).to_s.sub(".",",")) # TODO remove the format hack 
-  end
+RSpec.configure do |config|
+  config.include RequestHelper
 end

data/spec/support/setup/admin.rb

@@ -0,0 +1,4 @@
+unless Clerk.where( :email =>  "admin@important.me").first
+  admin = Clerk.new( :email =>  "admin@important.me" , :admin => true , :password => "password" ) 
+   admin.save!
+end

data/spec/support/setup/capybara.rb

@@ -0,0 +1,14 @@
+require 'capybara/rspec'
+require 'capybara-screenshot/rspec'
+Capybara::Screenshot.prune_strategy = :keep_last_run
+
+#require 'capybara/poltergeist'
+#Capybara.javascript_driver = :poltergeist
+
+Capybara.default_selector = :css
+
+RSpec.configure do |config|
+
+  config.include Capybara::DSL  
+
+end

data/spec/support/setup/cleaner.rb

@@ -0,0 +1,22 @@
+require "database_cleaner"
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+  config.before(:suite) do
+    DatabaseCleaner.clean_with :truncation
+    DatabaseCleaner.strategy = :transaction
+  end
+  config.before(:each) do |group|
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each, :js => true) do
+    DatabaseCleaner.strategy = :truncation
+  end
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/setup/email.rb

@@ -0,0 +1,6 @@
+require 'email_spec'
+
+RSpec.configure do |config|
+  config.include(EmailSpec::Helpers)
+  config.include(EmailSpec::Matchers)
+end

data/spec/support/setup/factory_girl.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

metadata

@@ -1,215 +1,243 @@
 --- !ruby/object:Gem::Specification
 name: office_clerk
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Torsten Rüger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - '>='
+        version: '4.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - '>='
+        version: '4.1'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: valid_email
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Rubyclerks is a small buisness management solution, including an online
@@ -220,11 +248,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- ChangeLog.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -299,15 +329,17 @@ files:
 - app/views/layouts/_google.haml
 - app/views/layouts/_header_extra.haml
 - app/views/layouts/_messages.html.haml
+- app/views/layouts/office_clerk.csv.erb
 - app/views/layouts/office_clerk.haml
 - app/views/layouts/sales_clerk.haml
 - app/views/manage/_hash.haml
 - app/views/manage/all.haml
-- app/views/order_mailer/cancel.html.haml
-- app/views/order_mailer/confirm.html.haml
-- app/views/order_mailer/paid.html.haml
-- app/views/order_mailer/shipped.html.haml
+- app/views/order_mailer/cancel.text.erb
+- app/views/order_mailer/confirm.text.erb
+- app/views/order_mailer/paid.text.erb
+- app/views/order_mailer/shipped.text.erb
 - app/views/orders/edit.html.haml
+- app/views/orders/index.csv.erb
 - app/views/orders/index.html.haml
 - app/views/orders/ship.haml
 - app/views/orders/show.html.haml
@@ -338,7 +370,6 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
-- config/i18n-tasks.yml
 - config/initializers/backtrace_silencers.rb
 - config/initializers/filter_parameter_logging.rb
 - config/initializers/inflections.rb
@@ -349,6 +380,7 @@ files:
 - config/locales/en.yml
 - config/locales/fi.yml
 - config/routes.rb
+- config/spring.rb
 - db/migrate/20131224171442_clerks.rb
 - db/migrate/20131226110406_suppliers.rb
 - db/migrate/20131226143612_categories.rb
@@ -394,6 +426,7 @@ files:
 - spec/features/baskets/index_spec.rb
 - spec/features/baskets/search_spec.rb
 - spec/features/baskets/show_spec.rb
+- spec/features/categories_search_spec.rb
 - spec/features/categories_spec.rb
 - spec/features/clerks_spec.rb
 - spec/features/orders_spec.rb
@@ -424,8 +457,14 @@ files:
 - spec/routing/purchases_routing_spec.rb
 - spec/routing/suppliers_routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_girl.rb
+- spec/support/basket_helper.rb
+- spec/support/product_helper.rb
 - spec/support/request_helper.rb
+- spec/support/setup/admin.rb
+- spec/support/setup/capybara.rb
+- spec/support/setup/cleaner.rb
+- spec/support/setup/email.rb
+- spec/support/setup/factory_girl.rb
 - test_app/README.rdoc
 - test_app/app/assets/javascripts/application.js
 - test_app/app/assets/stylesheets/application.css
@@ -467,8 +506,6 @@ files:
 - test_app/public/500.html
 - test_app/public/favicon.ico
 - test_app/public/robots.txt
-- test_app/spec/rails_helper.rb
-- test_app/spec/spec_helper.rb
 - todo
 homepage: https://github.com/rubyclerks/office_clerk
 licenses:
@@ -480,18 +517,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Backend of rubyclerks, a simple way to manage a buisness
@@ -518,6 +555,7 @@ test_files:
 - spec/features/baskets/index_spec.rb
 - spec/features/baskets/search_spec.rb
 - spec/features/baskets/show_spec.rb
+- spec/features/categories_search_spec.rb
 - spec/features/categories_spec.rb
 - spec/features/clerks_spec.rb
 - spec/features/orders_spec.rb
@@ -548,5 +586,11 @@ test_files:
 - spec/routing/purchases_routing_spec.rb
 - spec/routing/suppliers_routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_girl.rb
+- spec/support/basket_helper.rb
+- spec/support/product_helper.rb
 - spec/support/request_helper.rb
+- spec/support/setup/admin.rb
+- spec/support/setup/capybara.rb
+- spec/support/setup/cleaner.rb
+- spec/support/setup/email.rb
+- spec/support/setup/factory_girl.rb