flms 0.0.1 → 0.0.2

data/spec/factories/blocks.rb

@@ -1,6 +1,5 @@
 FactoryGirl.define do
   factory :block, class: Flms::Block do
     name { Faker::Lorem.word }
-    active false
   end
 end

data/spec/factories/layer.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :layer, class: Flms::Layer do
+    name { Faker::Lorem.word }
+  end
+end

data/spec/features/blocks/activating_blocks_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+feature 'Blocks > Activating blocks' do
+  include NamedFactories
+
+  scenario 'activating a block', js: true do
+    block_1a
+
+    capybara_sign_in user_1
+    visit "/flms/pages/#{page_1.url}/blocks"
+    page.evaluate_script "$('.switch').bootstrapSwitch('setState', true);"
+    click_on 'save'
+    sleep 0.1
+
+    expect(block_1a.reload.blocks_pages.first).to be_active
+  end
+end
+

data/spec/features/blocks/create_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Blocks > Create' do
-  test_helpers
+  include NamedFactories
 
   scenario 'creating a new block' do
     capybara_sign_in user_1
@@ -16,4 +16,3 @@ feature 'Blocks > Create' do
     expect(block.name).to eql 'my new block'
   end
 end
-

data/spec/features/blocks/delete_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 feature 'Blocks > Delete' do
-  test_helpers
+  include NamedFactories
 
   scenario 'deleting a new block', js: true do
-    page_1.blocks << block_1
+    block_1a
 
     capybara_sign_in user_1
     visit "/flms/pages/#{page_1.url}/blocks"

data/spec/features/blocks/edit_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 feature 'Blocks > Edit' do
-  test_helpers
+  include NamedFactories
 
   scenario 'editing an existing block' do
-    page_1.blocks << block_1
+    block_1a
 
     capybara_sign_in user_1
     visit "/flms/pages/#{page_1.url}/blocks"

data/spec/features/blocks/show_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 feature 'Blocks > Show' do
-  test_helpers
+  include NamedFactories
 
   scenario 'editing an existing block' do
-    page_1.blocks << block_1
+    block_1a
 
     capybara_sign_in user_1
-    visit "/flms/pages/#{page_1.url}/blocks/#{block_1.id}"
+    visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
     expect(page).to have_content ''
   end
 end

data/spec/features/dashboard_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Dashboard' do
-  test_helpers
+  include NamedFactories
 
   scenario 'visiting the dashboard' do
     capybara_sign_in user_1

data/spec/features/layers/create_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+feature 'Layers > Create' do
+  include NamedFactories
+
+  scenario 'creating a new layer' do
+    capybara_sign_in user_1
+    visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+    click_link 'New Layer'
+    fill_in 'Name', with: 'my new layer'
+    click_button 'Create Layer'
+
+    # Expect to be back at the block page.
+    expect(current_path).to eql "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+
+    # Expect that the layer is created.
+    expect(Flms::Layer).to have(1).instances
+    expect(block_1a.reload).to have(1).layers
+    layer = block_1a.layers.first
+    expect(layer.name).to eql 'my new layer'
+  end
+end

data/spec/features/layers/index_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+feature 'Layers > Index' do
+  include NamedFactories
+
+  scenario 'creating a new layer' do
+    layer_1a1
+    capybara_sign_in user_1
+    visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+
+    expect(page).to have_content layer_1a1.name
+  end
+end

data/spec/features/layers/update_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+feature 'Layers > Update' do
+  include NamedFactories
+
+  scenario 'editing an existing layer' do
+    layer_1a1
+
+    capybara_sign_in user_1
+    visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+    click_link 'edit'
+    fill_in 'Name', with: 'new layer name'
+    click_button 'Update Layer'
+
+    # Expect to be back at the block page.
+    expect(current_path).to eql "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+
+    # Check database updates.
+    expect(Flms::Layer).to have(1).instances
+    layer = block_1a.reload.layers.first
+    expect(layer.name).to eql 'new layer name'
+  end
+end

data/spec/features/login_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'log in' do
-  test_helpers
+  include NamedFactories
 
   scenario 'with valid email and password' do
     visit '/flms/login'

data/spec/features/pages/create_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Pages > Create' do
-  test_helpers
+  include NamedFactories
 
   scenario 'allows to create a new page' do
     capybara_sign_in user_1

data/spec/features/pages/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Pages > Delete' do
-  test_helpers
+  include NamedFactories
 
   scenario 'allows to delete a new page', js: true do
     create :page

data/spec/features/pages/index_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Pages > Index' do
-  test_helpers
+  include NamedFactories
 
   scenario 'shows all pages' do
     page_1 = create :page

data/spec/features/pages/update_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Pages > Create' do
-  test_helpers
+  include NamedFactories
 
   scenario 'allows to create a new page' do
     capybara_sign_in user_1

data/spec/features/users/create_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Users > Create' do
-  test_helpers
+  include NamedFactories
 
   scenario 'creates new users' do
     capybara_sign_in user_1

data/spec/features/users/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Users > Delete' do
-  test_helpers
+  include NamedFactories
 
   scenario 'allows to delete a new page', js: true do
     capybara_sign_in user_1

data/spec/features/users/index_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Users > Index' do
-  test_helpers
+  include NamedFactories
 
   scenario 'lists all existing users' do
     user_1 ; user_2

data/spec/models/block_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Flms::Block do
-  test_helpers
+  include NamedFactories
 
   describe 'associations' do
     it 'has pages' do
-      block_1.pages << page_1
-      expect(block_1).to have(1).pages
-      expect(block_1.pages.first).to eql page_1
+      block.pages << page_1
+      expect(block).to have(1).pages
+      expect(block.pages.first).to eql page_1
     end
   end
 end

data/spec/models/page_spec.rb

@@ -1,15 +1,39 @@
 require 'spec_helper'
 
 describe Flms::Page do
-  test_helpers
+  include NamedFactories
+
+  subject { create :page }
+  let(:subject_with_block) { subject.blocks << block ; subject }
 
   describe 'associations' do
     it 'has blocks' do
-      page_1.blocks << block_1
-      expect(page_1).to have(1).blocks
-      expect(page_1.blocks.first).to eql block_1
+      expect(subject_with_block).to have(1).blocks
+      expect(subject_with_block.blocks.first).to eql block
+    end
+  end
+
+  describe 'ordered_blocks_pages' do
+
+    it 'returns the blocks_pages for the page, ordered by "ordering"' do
+      block_1b
+      block_1a
+
+      result = page_1.ordered_blocks_pages
+      expect(result).to have(2).instances
+      expect(result[0].ordering).to eql 1
+      expect(result[1].ordering).to eql 2
+      expect(result[0].block).to eq block_1a
+      expect(result[1].block).to eq block_1b
     end
   end
-end
 
+  describe 'position_for_block' do
+    it 'returns the "blocks_pages" object for the given block on this page' do
+      result = subject_with_block.position_for_block(block.id)
+      expect(result.page).to eq subject
+      expect(result.block).to eq block
+    end
+  end
+end