vedeu 0.6.20 → 0.6.21

data/test/lib/vedeu/dsl/composition_test.rb

@@ -11,12 +11,6 @@ module Vedeu
       let(:model)     { Vedeu::Views::Composition.new }
       let(:client)    {}
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-        it { instance.instance_variable_get('@client').must_equal(client) }
-      end
-
       describe '#view' do
         subject {
           instance.view('dysprosium') do

data/test/lib/vedeu/dsl/dsl_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 module Vedeu
 
   describe DSL do
+
   end # DSL
 
 end # Vedeu

data/test/lib/vedeu/dsl/interface_test.rb

@@ -14,12 +14,6 @@ module Vedeu
       let(:_name)  { 'actinium' }
       let(:client) {}
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-        it { instance.instance_variable_get('@client').must_equal(client) }
-      end
-
       describe '.interface' do
         after { Vedeu.interfaces.reset }
 

data/test/lib/vedeu/dsl/keymap_test.rb

@@ -10,11 +10,6 @@ module Vedeu
       let(:instance)  { described.new(model) }
       let(:model)     { Vedeu::Input::Keymap.new(name: '_test_') }
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-      end
-
       describe '#key' do
         let(:value_or_values) { ['j', :down] }
 

data/test/lib/vedeu/dsl/line_test.rb

@@ -24,13 +24,6 @@ module Vedeu
         }
       }
 
-
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-        it { instance.instance_variable_get('@client').must_equal(client) }
-      end
-
       describe '#line' do
         let(:_value) { '' }
 

data/test/lib/vedeu/dsl/stream_test.rb

@@ -9,15 +9,8 @@ module Vedeu
       let(:described) { Vedeu::DSL::Stream }
       let(:instance)  { described.new(model) }
       let(:model)     { Vedeu::Views::Stream.new(parent: parent) }
-      let(:client)    {}
       let(:parent)    { Vedeu::Views::Line.new }
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-        it { instance.instance_variable_get('@client').must_equal(client) }
-      end
-
       describe '#stream' do
         subject { instance.stream { } }
 

data/test/lib/vedeu/editor/cursor_test.rb

@@ -10,14 +10,15 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          y:   y,
-          x:   x,
-          bx:  bx,
-          by:  by,
-          byn: byn,
-          bxn: bxn,
-          oy:  oy,
-          ox:  ox
+          y:    y,
+          x:    x,
+          bx:   bx,
+          by:   by,
+          byn:  byn,
+          bxn:  bxn,
+          name: _name,
+          oy:   oy,
+          ox:   ox
         }
       }
       let(:y)         { 0 }
@@ -26,6 +27,7 @@ module Vedeu
       let(:bx)        { 1 }
       let(:byn)       { 6 }
       let(:bxn)       { 6 }
+      let(:_name)     { 'editor_cursor' }
       let(:oy)        { 0 }
       let(:ox)        { 0 }
 
@@ -37,6 +39,7 @@ module Vedeu
         it { instance.instance_variable_get('@bx').must_equal(bx) }
         it { instance.instance_variable_get('@byn').must_equal(byn) }
         it { instance.instance_variable_get('@bxn').must_equal(bxn) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
         it { instance.instance_variable_get('@oy').must_equal(0) }
         it { instance.instance_variable_get('@ox').must_equal(0) }
 
@@ -71,6 +74,7 @@ module Vedeu
           instance.must_respond_to(:bxn=)
           instance.must_respond_to(:byn)
           instance.must_respond_to(:byn=)
+          instance.must_respond_to(:name)
           instance.must_respond_to(:ox)
           instance.must_respond_to(:ox=)
           instance.must_respond_to(:oy)
@@ -116,6 +120,17 @@ module Vedeu
         it { subject.ox.must_equal(3) }
       end
 
+      describe '#store' do
+        before { Vedeu::Cursors::Cursor.stubs(:store) }
+
+        subject { instance.store }
+
+        it 'stores the virtual cursor in place of the real cursor' do
+          Vedeu::Cursors::Cursor.expects(:store)
+          subject.must_be_instance_of(described)
+        end
+      end
+
       describe '#reset!' do
         let(:x)  { 11 }
         let(:y)  { 5 }

data/test/lib/vedeu/editor/document_test.rb

@@ -19,9 +19,24 @@ module Vedeu
         "Helium\n"    \
         "Lithium\n"
       }
-      let(:_name)  { 'Vedeu::Editor::Document' }
+      let(:_name)    { 'Vedeu::Editor::Document' }
+      let(:border)   {
+        Vedeu::Borders::Border.new({ name: _name, enabled: false })
+      }
+      let(:geometry) {
+        Vedeu::Geometry::Geometry.new({ name: _name, x: 1, xn: 5, y: 1, yn: 5 })
+      }
+      let(:interface) {
+        Vedeu::Models::Interface.new({ name: _name })
+      }
 
-      before { Vedeu::Output::Direct.stubs(:write) }
+      before {
+        Vedeu.borders.stubs(:by_name).with(_name).returns(border)
+        Vedeu.geometries.stubs(:by_name).with(_name).returns(geometry)
+        Vedeu.interfaces.stubs(:by_name).with(_name).returns(interface)
+
+        Vedeu::Output::Output.stubs(:render)
+      }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -44,28 +59,14 @@ module Vedeu
       end
 
       describe '#clear' do
-        let(:expected) {
-          "\e[1;1H\e[1;1H     " \
-          "\e[2;1H     " \
-          "\e[3;1H     " \
-          "\e[4;1H     " \
-          "\e[5;1H     " \
-          "\e[1;1H"
-        }
-
-        before do
-          Vedeu::Geometry::Geometry.new(name: _name,
-                                        x:    1,
-                                        y:    1,
-                                        xn:   5,
-                                        yn:   5).store
-          Vedeu::Terminal.stubs(:output)
-          Vedeu::Output::Direct.stubs(:write).returns(expected)
-        end
+        before { Vedeu.stubs(:trigger).with(:_clear_view_, _name) }
 
         subject { instance.clear }
 
-        it { subject.must_equal(expected) }
+        it {
+          Vedeu.expects(:trigger).with(:_clear_view_, _name)
+          subject
+        }
       end
 
       describe '#delete_character' do
@@ -181,12 +182,15 @@ module Vedeu
         }
         let(:output) { "\e[1;1HA\e[2;1HB\e[3;1HC\e[1;1H\e[?25h" }
 
-        before { Vedeu::Output::Direct.stubs(:write) }
+        before {
+          Vedeu.stubs(:trigger).with(:_clear_view_, _name)
+          Vedeu::Output::Output.stubs(:render)
+        }
 
         subject { instance.render }
 
         it {
-          Vedeu::Output::Direct.expects(:write).with(value: output, x: 1, y: 1)
+          Vedeu::Output::Output.expects(:render)
           subject
         }
       end

data/test/lib/vedeu/editor/line_test.rb

@@ -282,36 +282,6 @@ module Vedeu
         end
       end
 
-      describe '#to_chars' do
-        subject { instance.to_chars }
-
-        context 'when the line is empty' do
-          let(:line) {}
-
-          it { subject.must_equal([]) }
-        end
-
-        context 'when the line is not empty' do
-          let(:expected) {
-            [
-              Vedeu::Views::Char.new(value: 'S'),
-              Vedeu::Views::Char.new(value: 'o'),
-              Vedeu::Views::Char.new(value: 'm'),
-              Vedeu::Views::Char.new(value: 'e'),
-              Vedeu::Views::Char.new(value: ' '),
-              Vedeu::Views::Char.new(value: 't'),
-              Vedeu::Views::Char.new(value: 'e'),
-              Vedeu::Views::Char.new(value: 'x'),
-              Vedeu::Views::Char.new(value: 't'),
-              Vedeu::Views::Char.new(value: '.'),
-              Vedeu::Views::Char.new(value: '.'),
-              Vedeu::Views::Char.new(value: '.'),
-            ]
-          }
-          it { subject.must_equal(expected) }
-        end
-      end
-
       describe '#to_s' do
         subject { instance.to_s }
 

data/test/lib/vedeu/geometry/dsl_test.rb

@@ -10,11 +10,6 @@ module Vedeu
       let(:instance)  { described.new(model) }
       let(:model)     { Vedeu::Geometry::Geometry.new }
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-      end
-
       describe '.geometry' do
         it { described.must_respond_to(:geometry) }
       end

data/test/lib/vedeu/geometry/null_test.rb

@@ -29,36 +29,6 @@ module Vedeu
         it { instance.must_respond_to(:name) }
       end
 
-      describe '#null?' do
-        subject { instance.null? }
-
-        it { subject.must_be_instance_of(TrueClass) }
-      end
-
-      describe '#centred' do
-        subject { instance.centred }
-
-        it { subject.must_equal(false) }
-      end
-
-      describe '#maximise' do
-        subject { instance.maximise }
-
-        it { subject.must_equal(false) }
-      end
-
-      describe '#store' do
-        subject { instance.store }
-
-        it { subject.must_be_instance_of(described) }
-      end
-
-      describe '#unmaximise' do
-        subject { instance.unmaximise }
-
-        it { subject.must_equal(false) }
-      end
-
       describe '#height' do
         before { Vedeu::Terminal.stubs(:size).returns([25, 40]) }
 

data/test/lib/vedeu/groups/dsl_test.rb

@@ -12,12 +12,6 @@ module Vedeu
       let(:client)     {}
       let(:group_name) { 'main_screen' }
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-        it { instance.instance_variable_get('@client').must_equal(client) }
-      end
-
       describe '.group' do
         context 'when the block is given' do
           subject {

data/test/lib/vedeu/groups/group_test.rb

@@ -41,20 +41,30 @@ module Vedeu
         }
       end
 
+      describe '.store' do
+        subject { described.store(attributes) }
+
+        it { subject.must_equal(instance) }
+      end
+
       describe '#add' do
         subject { instance.add('hydrogen') }
 
-        it { subject.must_be_instance_of(Vedeu::Groups::Group) }
+        it { subject.must_be_instance_of(described) }
 
         context 'when the member already exists' do
+          let(:members) { ['hydrogen', 'carbon', 'nitrogen', 'oxygen'] }
+
           it 'does not add the member again but returns a new Group' do
-            subject.wont_equal(instance)
+            subject.members.must_equal(Set.new(members))
           end
         end
 
         context 'when the member does not exist' do
+          let(:members) { ['carbon', 'nitrogen', 'oxygen'] }
+
           it 'adds the member and returns a new Group' do
-            subject.wont_equal(instance)
+            subject.members.must_include('hydrogen')
           end
         end
       end
@@ -104,18 +114,16 @@ module Vedeu
         context 'when the group is already empty' do
           let(:members) { [] }
 
-          it { subject.wont_equal(instance) }
+          it { subject.members.must_equal(Set.new) }
         end
 
         context 'when the member exists' do
           let(:member) { 'oxygen' }
 
-          it { subject.wont_equal(instance) }
           it { subject.members.wont_include(member) }
         end
 
         context 'when the member does not exist' do
-          it { subject.wont_equal(instance) }
           it { subject.members.wont_include(member) }
         end
       end
@@ -123,7 +131,7 @@ module Vedeu
       describe '#reset' do
         subject { instance.reset }
 
-        it { subject.must_be_instance_of(Vedeu::Groups::Group) }
+        it { subject.must_be_instance_of(described) }
         it { subject.members.must_be_empty }
       end
 

data/test/lib/vedeu/menus/dsl_test.rb

@@ -18,11 +18,6 @@ module Vedeu
       let(:collection) { [:sodium, :magnesium, :aluminium, :silicon] }
       let(:menu_name)  { 'elements' }
 
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@model').must_equal(model) }
-      end
-
       describe '#item' do
         let(:_value) { :platinum }
 

data/test/lib/vedeu/models/cell_test.rb

@@ -37,6 +37,10 @@ module Vedeu
         }
       end
 
+      describe '#cell?' do
+        it { instance.cell?.must_equal(true) }
+      end
+
       describe '#eql?' do
         let(:other) { described.new(value: nil, position: nil) }
 

data/test/lib/vedeu/models/escape_test.rb

@@ -23,6 +23,10 @@ module Vedeu
         it { instance.instance_variable_get('@value').must_equal(_value) }
       end
 
+      describe '#cell?' do
+        it { instance.cell?.must_equal(false) }
+      end
+
       describe '#null' do
         it { instance.null.must_equal(nil) }
         it { instance.background.must_equal(nil) }

data/test/lib/vedeu/models/views/char_test.rb

@@ -68,6 +68,10 @@ module Vedeu
         }
       end
 
+      describe '#cell?' do
+        it { instance.cell?.must_equal(false) }
+      end
+
       describe '#chars' do
         subject { instance.chars }
 

data/test/lib/vedeu/null/generic_test.rb

@@ -28,12 +28,24 @@ module Vedeu
         }
       end
 
+      describe '#falsy' do
+        subject { instance.falsy }
+
+        it { subject.must_be_instance_of(FalseClass) }
+
+        it { instance.must_respond_to(:centred) }
+        it { instance.must_respond_to(:maximise) }
+        it { instance.must_respond_to(:maximised?) }
+        it { instance.must_respond_to(:unmaximise) }
+      end
+
       describe '#null' do
         subject { instance.null }
 
         it { subject.must_be_instance_of(NilClass) }
         it { instance.must_respond_to(:add) }
         it { instance.must_respond_to(:bottom_item) }
+        it { instance.must_respond_to(:clear) }
         it { instance.must_respond_to(:colour) }
         it { instance.must_respond_to(:current_item) }
         it { instance.must_respond_to(:deselect_item) }
@@ -43,6 +55,7 @@ module Vedeu
         it { instance.must_respond_to(:next_item) }
         it { instance.must_respond_to(:parent) }
         it { instance.must_respond_to(:prev_item) }
+        it { instance.must_respond_to(:render) }
         it { instance.must_respond_to(:select_item) }
         it { instance.must_respond_to(:selected_item) }
         it { instance.must_respond_to(:show) }