6 files changed, 93 insertions, 110 deletions
diff --git a/spec/ruby/library/observer/add_observer_spec.rb b/spec/ruby/library/observer/add_observer_spec.rb
index 4c33c64734..5217ae6dc4 100644
--- a/spec/ruby/library/observer/add_observer_spec.rb
+++ b/spec/ruby/library/observer/add_observer_spec.rb
@@ -1,26 +1,23 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is ""..."3.4" do
-  require_relative 'fixtures/classes'
+describe "Observer#add_observer" do
 
-  describe "Observer#add_observer" do
-
-    before :each do
-      @observable = ObservableSpecs.new
-      @observer = ObserverCallbackSpecs.new
-    end
-
-    it "adds the observer" do
-      @observer.value.should == nil
-      @observable.changed
-      @observable.notify_observers("test")
-      @observer.value.should == nil
+  before :each do
+    @observable = ObservableSpecs.new
+    @observer = ObserverCallbackSpecs.new
+  end
 
-      @observable.add_observer(@observer)
-      @observable.changed
-      @observable.notify_observers("test2")
-      @observer.value.should == "test2"
-    end
+  it "adds the observer" do
+    @observer.value.should == nil
+    @observable.changed
+    @observable.notify_observers("test")
+    @observer.value.should == nil
 
+    @observable.add_observer(@observer)
+    @observable.changed
+    @observable.notify_observers("test2")
+    @observer.value.should == "test2"
   end
+
 end
diff --git a/spec/ruby/library/observer/count_observers_spec.rb b/spec/ruby/library/observer/count_observers_spec.rb
index ab733e4e40..c93674196d 100644
--- a/spec/ruby/library/observer/count_observers_spec.rb
+++ b/spec/ruby/library/observer/count_observers_spec.rb
@@ -1,26 +1,23 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is ""..."3.4" do
-  require_relative 'fixtures/classes'
-
-  describe "Observer#count_observers" do
-    before :each do
-      @observable = ObservableSpecs.new
-      @observer   = ObserverCallbackSpecs.new
-      @observer2  = ObserverCallbackSpecs.new
-    end
+describe "Observer#count_observers" do
+  before :each do
+    @observable = ObservableSpecs.new
+    @observer   = ObserverCallbackSpecs.new
+    @observer2  = ObserverCallbackSpecs.new
+  end
 
-    it "returns the number of observers" do
-      @observable.count_observers.should == 0
-      @observable.add_observer(@observer)
-      @observable.count_observers.should == 1
-      @observable.add_observer(@observer2)
-      @observable.count_observers.should == 2
-    end
+  it "returns the number of observers" do
+    @observable.count_observers.should == 0
+    @observable.add_observer(@observer)
+    @observable.count_observers.should == 1
+    @observable.add_observer(@observer2)
+    @observable.count_observers.should == 2
+  end
 
-    it "returns the number of unique observers" do
-      2.times { @observable.add_observer(@observer) }
-      @observable.count_observers.should == 1
-    end
+  it "returns the number of unique observers" do
+    2.times { @observable.add_observer(@observer) }
+    @observable.count_observers.should == 1
   end
 end
diff --git a/spec/ruby/library/observer/delete_observer_spec.rb b/spec/ruby/library/observer/delete_observer_spec.rb
index 83db19bae2..52be1a6cba 100644
--- a/spec/ruby/library/observer/delete_observer_spec.rb
+++ b/spec/ruby/library/observer/delete_observer_spec.rb
@@ -1,22 +1,19 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is ""..."3.4" do
-  require_relative 'fixtures/classes'
-
-  describe "Observer#delete_observer" do
-    before :each do
-      @observable = ObservableSpecs.new
-      @observer = ObserverCallbackSpecs.new
-    end
-
-    it "deletes the observer" do
-      @observable.add_observer(@observer)
-      @observable.delete_observer(@observer)
+describe "Observer#delete_observer" do
+  before :each do
+    @observable = ObservableSpecs.new
+    @observer = ObserverCallbackSpecs.new
+  end
 
-      @observable.changed
-      @observable.notify_observers("test")
-      @observer.value.should == nil
-    end
+  it "deletes the observer" do
+    @observable.add_observer(@observer)
+    @observable.delete_observer(@observer)
 
+    @observable.changed
+    @observable.notify_observers("test")
+    @observer.value.should == nil
   end
+
 end
diff --git a/spec/ruby/library/observer/delete_observers_spec.rb b/spec/ruby/library/observer/delete_observers_spec.rb
index 5e7fe21d74..186e93a013 100644
--- a/spec/ruby/library/observer/delete_observers_spec.rb
+++ b/spec/ruby/library/observer/delete_observers_spec.rb
@@ -1,22 +1,19 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is ""..."3.4" do
-  require_relative 'fixtures/classes'
-
-  describe "Observer#delete_observers" do
-    before :each do
-      @observable = ObservableSpecs.new
-      @observer = ObserverCallbackSpecs.new
-    end
-
-    it "deletes the observers" do
-      @observable.add_observer(@observer)
-      @observable.delete_observers
+describe "Observer#delete_observers" do
+  before :each do
+    @observable = ObservableSpecs.new
+    @observer = ObserverCallbackSpecs.new
+  end
 
-      @observable.changed
-      @observable.notify_observers("test")
-      @observer.value.should == nil
-    end
+  it "deletes the observers" do
+    @observable.add_observer(@observer)
+    @observable.delete_observers
 
+    @observable.changed
+    @observable.notify_observers("test")
+    @observer.value.should == nil
   end
+
 end
diff --git a/spec/ruby/library/observer/fixtures/classes.rb b/spec/ruby/library/observer/fixtures/classes.rb
index d1f9079963..70cd1b1be2 100644
--- a/spec/ruby/library/observer/fixtures/classes.rb
+++ b/spec/ruby/library/observer/fixtures/classes.rb
@@ -1,19 +1,17 @@
-ruby_version_is ""..."3.4" do
-  require 'observer'
+require 'observer'
 
-  class ObserverCallbackSpecs
-    attr_reader :value
+class ObserverCallbackSpecs
+  attr_reader :value
 
-    def initialize
-      @value = nil
-    end
-
-    def update(value)
-      @value = value
-    end
+  def initialize
+    @value = nil
   end
 
-  class ObservableSpecs
-    include Observable
+  def update(value)
+    @value = value
   end
 end
+
+class ObservableSpecs
+  include Observable
+end
diff --git a/spec/ruby/library/observer/notify_observers_spec.rb b/spec/ruby/library/observer/notify_observers_spec.rb
index 1030ae701e..6f3f984637 100644
--- a/spec/ruby/library/observer/notify_observers_spec.rb
+++ b/spec/ruby/library/observer/notify_observers_spec.rb
@@ -1,34 +1,31 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is ""..."3.4" do
-  require_relative 'fixtures/classes'
+describe "Observer#notify_observers" do
 
-  describe "Observer#notify_observers" do
-
-    before :each do
-      @observable = ObservableSpecs.new
-      @observer = ObserverCallbackSpecs.new
-      @observable.add_observer(@observer)
-    end
-
-    it "must call changed before notifying observers" do
-      @observer.value.should == nil
-      @observable.notify_observers("test")
-      @observer.value.should == nil
-    end
+  before :each do
+    @observable = ObservableSpecs.new
+    @observer = ObserverCallbackSpecs.new
+    @observable.add_observer(@observer)
+  end
 
-    it "verifies observer responds to update" do
-      -> {
-        @observable.add_observer(@observable)
-      }.should raise_error(NoMethodError)
-    end
+  it "must call changed before notifying observers" do
+    @observer.value.should == nil
+    @observable.notify_observers("test")
+    @observer.value.should == nil
+  end
 
-    it "receives the callback" do
-      @observer.value.should == nil
-      @observable.changed
-      @observable.notify_observers("test")
-      @observer.value.should == "test"
-    end
+  it "verifies observer responds to update" do
+    -> {
+      @observable.add_observer(@observable)
+    }.should.raise(NoMethodError)
+  end
 
+  it "receives the callback" do
+    @observer.value.should == nil
+    @observable.changed
+    @observable.notify_observers("test")
+    @observer.value.should == "test"
   end
+
 end