Merge branch 'AI3279-new_block_store' into stable

Conflicts: test/unit/box_organizer_helper_test.rb

Merge branch 'AI3279-new_block_store' into stable
Conflicts: test/unit/box_organizer_helper_test.rb
Victor Costa
2 parents 0d83548d 03d5c15c
Showing 2 changed files with 12 additions and 5 deletions Show diff stats
app/models/theme.rb
test/unit/box_organizer_helper_test.rb
@@ -13,8 +13,14 @@ class Theme
       Rails.root.join('public', 'user_themes')
     end
+    #FIXME make this test
     def system_themes_dir
-      Rails.root.join('public', 'designs', 'themes')
+      Rails.root.join('public', relative_themes_dir)
+    end
+
+    #FIXME make this test
+    def relative_themes_dir
+      File.join('designs', 'themes')
     end
     def create(id, attributes = {})
@@ -94,6 +100,11 @@ class Theme
   end
   #FIXME make this test
+  def public_path
+    File.join('/', self.class.relative_themes_dir, self.id)
+  end
+
+  #FIXME make this test
   def filesystem_path
     File.join(self.class.system_themes_dir, self.id)
   end
@@ -10,10 +10,6 @@ class BoxOrganizerHelperTest &lt; ActionView::TestCase
   attr_reader :environment
-  should 'max number of blocks be 7' do
-    assert_equal 7, max_number_of_blocks_per_line
-  end
-
   should 'display the default icon for block without icon' do
     class SomeBlock < Block; end
     block = SomeBlock