Rohan Mitchell
29235cd2cb
Merge branch 'master' into product-amount-units
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
spec/spec_helper.rb
2014-01-14 15:34:05 +11:00
Rohan Mitchell
7bbf2037e8
Add commented out option for remote debugging via poltergeist
2014-01-14 15:15:09 +11:00
Will Marshall
533a987684
Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom
2014-01-08 15:20:33 +11:00
Rohan Mitchell
458f91ef91
Add feature spec helper to select distributor and order cycle
2014-01-08 11:31:44 +11:00
Rohan Mitchell
521ed565b4
Modify specs to create enterprise groups where needed
2013-10-30 13:56:10 +11:00
Rohan Mitchell
57f7d489ff
Rename OpenFoodWeb namespace to OpenFoodNetwork
2013-10-18 17:29:55 +11:00
Rohan Mitchell
b032bc0420
Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout
2013-09-16 14:13:07 +10:00
Rohan Mitchell
91550ac82f
Move distributor config to its own file, re-enable pry for tests
2013-09-10 09:50:16 +10:00
alexs333
999bc2697a
Implemented simlified shop flow.
2013-09-04 20:33:18 +10:00
Rohan Mitchell
2cab83cb29
Admin create order can set distributor and order cycle
2013-08-23 14:00:31 +10:00
alexs
fdf80cac5e
Adjusted specs to accommodate for new (temporary) landing page.
2013-08-20 16:14:29 +10:00
Rohan Mitchell
e318a1591d
Add FeatureToggleHelper for tests, enabling feature toggle changes for tests
2013-08-19 10:41:14 +10:00
alexs
c72a4a961f
Added the mechanism to test JSON APIs (Rabl stuff etc.)
2013-08-15 11:38:52 +10:00
Rohan Mitchell
eaf71e28bb
Raise an error when tests hit the network
2013-08-14 11:19:16 +10:00
alexs
28f94ae959
Stubbed out geolocation.
2013-08-07 18:03:41 +10:00
alexs
38b0a581e0
New landing page - initial layout and functionality
2013-08-05 17:04:56 +10:00
alexs
fadb1e4710
Merge branch 'master' of github.com:eaterprises/openfoodweb
...
Conflicts:
Gemfile
2013-07-23 18:02:28 +10:00
alexs
37a88a1be6
Changed JavaScript driver from selenium to phantomjs.
2013-07-23 17:54:05 +10:00
Rohan Mitchell
1d5e970b47
Fix test regressions with multiple 'Save and Continue' buttons in checkout
2013-07-23 17:48:54 +10:00
Andrew Spinks
7cb054f430
Merge branch 'master' into order-cycle-selection
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/spree/orders_controller_decorator.rb
app/models/enterprise.rb
app/models/spree/order_decorator.rb
app/views/spree/checkout/_other_available_distributors.html.erb
app/views/spree/products/_add_to_cart.html.haml
lib/open_food_web/distributor_change_validator.rb
spec/spec_helper.rb
2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6
Merge branch 'local-organics'
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
2013-07-23 11:40:03 +10:00
Rohan Mitchell
f5f5433738
Require pry in test env outside of Travis
2013-07-22 16:56:00 +10:00
Rohan Mitchell
d0421cbc4d
Define feature toggles in FeatureToggle class rather than ENV['OFW_DEPLOYMENT']
2013-07-22 14:34:29 +10:00
Rohan Mitchell
71ee764d65
Fix travis fails - set deployment before requiring gems, race condition in distributor info spec
2013-06-07 17:08:55 +10:00
Rohan Mitchell
cbeffaced1
Configure Travis, remove spork, add simplecov, add turbo sprokets.
...
Add travis config
(cherry picked from commit e3fdb12289719ef386bfd60935c8002b192538953a441cd7d9b030793f15cdc3ab09a172aa8fe5e572aa8fe5e5bd5533e2b15089d3bb223e6c56a638ed7bded642fa11ff89821e94f88c5e
2013-06-07 16:23:24 +10:00
Rohan Mitchell
6670c9543b
Remove spork
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-04 14:04:26 +10:00
Rohan Mitchell
92a7f19ff1
Add specs for enterprises distributor info as rich text feature
2013-04-26 15:43:13 +10:00
Rohan Mitchell
7bee04e5f6
Update selenium-webdriver, test with eaterprises deployment settings by default
2013-04-22 16:48:49 +10:00
Rohan Mitchell
fa11ff8982
Remove more spork-specific things, remove unused cuc config from zeus
2013-04-05 15:25:46 +11:00
Rohan Mitchell
ed7bded642
Remove spork
2013-04-05 15:16:54 +11:00
Rohan Mitchell
a11f36e121
Provide pry in test env when we're not building with Travis
2013-04-05 11:30:26 +11:00
Rohan Mitchell
5089d3bb22
Add simplecov
2013-03-11 10:57:14 +11:00
Rohan Mitchell
fec81b7ed4
Fix failing specs after merge
2013-01-22 11:34:43 +11:00
Rohan Mitchell
340259eb2a
Fix database cleaner strategy: http://blog.55minutes.com/2012/05/faster-capybara-specs/
2012-06-26 16:19:54 +10:00
Rohan Mitchell
09f5bb8eed
Switch database cleaner strategy back to transaction after js test has run
2012-06-26 16:05:21 +10:00
Rohan Mitchell
a48a100bcc
Merge branch 'shop-by-distributor'
2012-06-25 09:10:50 +10:00
Andrew Spinks
4faed954e6
use database truncation for javascript request tests.
2012-06-24 11:41:19 +10:00
Rohan Mitchell
ebb624bdc3
Reload application files, routes and factories each spork run
2012-06-24 09:10:25 +10:00
Rohan Mitchell
16ff9e9611
Set up spree controller testing environment
2012-06-22 11:00:44 +10:00
Rohan Mitchell
b54cb00b29
Change database cleaner strategy to transaction, removing a 5 s per-test delay
2012-06-19 14:03:20 +10:00
Rohan Mitchell
f962db4288
Convert factories from machinist to factory girl
2012-06-19 13:54:34 +10:00
Rohan Mitchell
865f562dd0
Tidy up spec_helper.rb
2012-06-19 11:33:28 +10:00
Rohan Mitchell
eb095baf64
Installed spork
2012-06-19 07:08:27 +10:00
Rohan Mitchell
82ca7112c2
Remove distributor association from orders and from the checkout process
2012-06-18 17:01:08 +10:00
Andrew Spinks
93a5bddeb5
Added initial request spec for making a purchase.
2012-06-11 13:18:04 +10:00
Andrew Spinks
1288760839
Added first working acceptance spec for supplier.
2012-06-09 14:41:09 +10:00
Andrew Spinks
5088363c84
add supplier to product on admin views.
2012-04-29 18:35:14 +10:00
Andrew Spinks
511dfa23af
add rspec
2012-03-31 16:38:16 +11:00
