OSDN Git Service
(root)
/
elecoma
/
elecoma.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/travis_ci'
[elecoma/elecoma.git]
/
spec
/
controllers
/
products_controller_spec.rb
diff --git
a/spec/controllers/products_controller_spec.rb
b/spec/controllers/products_controller_spec.rb
index
80f55f4
..
34cb214
100644
(file)
--- a/
spec/controllers/products_controller_spec.rb
+++ b/
spec/controllers/products_controller_spec.rb
@@
-2,7
+2,7
@@
require File.dirname(__FILE__) + '/../spec_helper'
describe ProductsController do
require File.dirname(__FILE__) + '/../spec_helper'
describe ProductsController do
- fixtures :products, :categories, :seos, :product_styles, :styles, :style_categories
+ fixtures :products, :categories, :seos, :product_styles, :styles, :style_categories
, :shops
before do
end
before do
end