ayadn 1.8.2 → 2.0

data/spec/unit/view_spec.rb

@@ -17,13 +17,14 @@ describe Ayadn::View do
           symbols: :green,
           index: :blue,
           date: :cyan,
-          link: :magenta
+          link: :magenta,
+          excerpt: :green
         },
         timeline: {
-          show_real_name: true,
-          show_date: true,
-          show_symbols: true,
-          show_source: true
+          name: true,
+          date: true,
+          symbols: true,
+          source: true
         },
         formats: {
           table: {width: 75},
@@ -31,16 +32,21 @@ describe Ayadn::View do
         },
         counts: {
           default: 33
-        }
+        },
+        blacklist: {active: true}
       })
     Ayadn::Settings.stub(:config).and_return({
         identity: {
           username: 'test'
         }
       })
+    Ayadn::Settings.stub(:global).and_return({
+        scrolling: false
+      })
     Ayadn::Logs.stub(:rec).and_return("logged")
     Ayadn::Databases.stub(:blacklist).and_return("blacklist")
     Ayadn::Databases.stub(:save_indexed_posts).and_return("indexed")
+    Ayadn::Databases.stub(:is_in_blacklist?).and_return(false)
   end
 
   describe "#settings" do

data/spec/unit/workers_spec.rb

@@ -9,17 +9,39 @@ describe Ayadn::Workers do
         colors: {
           hashtags: :cyan,
           mentions: :red,
-          username: :green
+          username: :green,
+          excerpt: :green
         },
         timeline: {compact: false},
-        formats: {table: {width: 75}, list: {reverse: true}}
+        formats: {table: {width: 75}, list: {reverse: true}},
+        blacklist: {active: true}
       })
+    Ayadn::Settings.stub(:config).and_return({
+      identity: {
+        username: 'test',
+        handle: '@test'
+      },
+      post_max_length: 256,
+      message_max_length: 2048,
+      version: 'wee',
+      paths: {
+        db: 'spec/mock/',
+        log: 'spec/mock'
+      }
+    })
+    Ayadn::Settings.stub(:global).and_return({
+      scrolling: false,
+      force: false
+    })
     Ayadn::Logs.stub(:rec).and_return("logged")
     Ayadn::Databases.stub(:blacklist).and_return("blacklist")
     Ayadn::Databases.stub(:users).and_return("users")
-    Ayadn::Databases.stub(:get_post_from_index).and_return({id: 3312})
     Ayadn::Databases.stub(:get_index_length).and_return(50)
+    Ayadn::Databases.stub(:get_post_from_index).and_return(30000)
+    Ayadn::Databases.stub(:is_in_blacklist?).and_return(false)
+    Dir.stub(:home).and_return("spec/mock")
     @workers = Ayadn::Workers.new
+    Ayadn::Databases.open_databases
   end
 
   let(:data) { JSON.parse(File.read("spec/mock/stream.json")) }
@@ -28,7 +50,7 @@ describe Ayadn::Workers do
   let(:users_list) { JSON.parse(File.read("spec/mock/fwr_@ayadn.json")) }
   #let(:rest) {Ayadn::CNX = double} #verbose in RSpec output, but useful
   let(:rest) {Ayadn::CNX}
-  let(:list) { {"007"=>["bond", "James Bond", true, true], "666"=>["mrtest", "Mr Test", false, false]} }
+  let(:list) { {"007"=>["bond", "James Bond", true, true, 7], "666"=>["mrtest", "Mr Test", false, false, 33012]} }
 
   describe "#build_posts" do
     it "builds posts hash from stream" do
@@ -48,7 +70,6 @@ describe Ayadn::Workers do
       expect(posts[23187443][:has_checkins]).to be false
       expect(posts[23187443][:mentions]).to eq []
       expect(posts[23187443][:checkins]).to be_empty
-      expect(posts[23187443].length).to eq 33
     end
     it "gets oembed link from checkins post" do
       posts = @workers.build_posts(checkins['data'])
@@ -65,10 +86,9 @@ describe Ayadn::Workers do
     end
   end
 
-  describe "#get_real_post_id" do
-    it "gets real post id" do
-      id = @workers.get_real_post_id(8)
-      expect(id).to eq 3312
+  describe "#get_post_from_index" do
+    it "returns the true post id if number is not in index" do
+      expect(@workers.get_post_from_index("30000")).to eq 30000
     end
   end
 
@@ -96,9 +116,9 @@ describe Ayadn::Workers do
   describe "#extract_users" do
     it "extracts users" do
       usr = @workers.extract_users(users_list[0])
-      expect(usr["52985"]).to eq ["schmidt_fu", "Florian Schmidt", false, false]
-      expect(usr["185581"]).to eq ["aya_tests", "@ericd's tests account", nil, nil]
-      expect(usr["69904"]).to eq ["ericd", "Eric Dejonckheere", true, true]
+      expect(usr["52985"]).to eq ["schmidt_fu", "Florian Schmidt", false, false, 5370]
+      expect(usr["185581"]).to eq ["aya_tests", "@ericd's tests account", nil, nil, 662]
+      expect(usr["69904"]).to eq ["ericd", "Eric Dejonckheere", true, true, 4513]
     end
   end
 
@@ -129,6 +149,8 @@ describe Ayadn::Workers do
       expect(printed).to include "@test"
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
+      expect(printed).to include "33012"
+      expect(printed).to include "7"
     end
   end
 
@@ -143,6 +165,8 @@ describe Ayadn::Workers do
       expect(printed).to include "@test"
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
+      expect(printed).to include "33012"
+      expect(printed).to include "7"
     end
   end
 
@@ -156,6 +180,7 @@ describe Ayadn::Workers do
       end
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
+      expect(printed).to include "33012"
     end
   end
 
@@ -169,6 +194,7 @@ describe Ayadn::Workers do
       end
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
+      expect(printed).to include "33012"
     end
   end