Merge pull request #460 from hpi-swa-teaching/develop

Merges results from 2021 into master

Author: codeZeilen

.github/pull_request_template.md

@@ -10,7 +10,7 @@ Please, go through these steps before you submit a PR.
     c. You have only one commit (if not, squash them into one commit).
 
     d. Running tests doesn't throw any error. If it does, fix them first and amend your commit (`git commit --amend`).
-    
+
     e. You have tracked ALL applicable time working in clockify!
 
 3. **After** these steps, you're ready to open a pull request.

.github/workflows/ci-linter.yml

@@ -1,6 +1,6 @@
 name: CI-Lint
 
-on: 
+on:
   push:
     branches:
       - develop

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: 
+on:
   push:
     branches:
       - develop
@@ -17,14 +17,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        smalltalk: [ Squeak64-Trunk, Squeak64-5.3, Squeak64-5.2 ]
+        smalltalk: [ Squeak64-5.3 ]
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-version: ${{ matrix.smalltalk }}
       - run: smalltalkci -s ${{ matrix.smalltalk }}
-        timeout-minutes: 15
+        timeout-minutes: 30
         env:
            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/upload-artifact@master
+        if: ${{ always() }}
+        with:
+          name: Test Artifacts (${{ matrix.smalltalk }} (${{ matrix.os }}))
+          path: /home/runner/.smalltalkCI/_builds/telegramTestResults

.github/workflows/release.yml

@@ -39,17 +39,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.tag_prefix.outputs.value }}${{ steps.current-time.outputs.formattedTime }} 
+          tag_name: ${{ steps.tag_prefix.outputs.value }}${{ steps.current-time.outputs.formattedTime }}
           release_name: ${{ matrix.smalltalk }} ${{ steps.current-time.outputs.formattedTime }}
           draft: false
           prerelease: ${{ env.prerelease }}
       - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: /home/runner/.smalltalkCI/_builds/TelegramClient.sar
           asset_name: TelegramClient.sar
           asset_content_type: application/zip

.gitignore

@@ -0,0 +1,2 @@
+.DS_STORE
+/.idea

.smalltalk.lint.ston

@@ -12,6 +12,6 @@ SmalltalkCISpec {
     'scripts/preLoading.st'
   ],
   #testing : {
-    #classes : [ #TCTLinterTests ]
+    #classes : [ #TCTMLinterTests ]
   }
 }

.smalltalk.release.ston

@@ -10,7 +10,7 @@ SmalltalkCISpec {
     }
   ],
    #testing : {
-    #classes : [ #TCTSarFileGenerator ],
+    #classes : [ #TCTMSarFileGenerator ],
     #defaultTimeout : 60
   }
 }

.smalltalk.ston

@@ -14,7 +14,7 @@ SmalltalkCISpec {
       #packages : [ 'TelegramClient-Core.*', 'TelegramClient-UI.*' ]
     },
     #exclude : {
-      #classes : [ #TCTLinterTests ]
+      #classes : [ #TCTMLinterTests ]
     },
     #defaultTimeout : 60
   }

.squot

@@ -1,6 +1,8 @@
 OrderedDictionary {
-	'packages\/TelegramClient-Core.package' : #SquotCypressCodeSerializer,
-	'packages\/TelegramClient-Tests.package' : #SquotCypressCodeSerializer,
-	'packages\/BaselineOfTelegramClient.package' : #SquotCypressCodeSerializer,
-	'packages\/TelegramClient-UI.package' : #SquotCypressCodeSerializer
+	'packages/TelegramClient-Core.package' : #SquotCypressCodeSerializer,
+	'packages/BaselineOfTelegramClient.package' : #SquotCypressCodeSerializer,
+	'packages/TelegramClient-UI.package' : #SquotCypressCodeSerializer,
+	'packages/TelegramClientTests-Core.package' : #SquotCypressCodeSerializer,
+	'packages/TelegramClientTests-UI.package' : #SquotCypressCodeSerializer,
+	'packages/TelegramClientTests-Misc.package' : #SquotCypressCodeSerializer
 }

CONTRIBUTING.md

@@ -83,7 +83,7 @@ $ git merge develop                                  // merges changes from mast
 When development on the feature is complete, reviewers should merge changes into `develop` and then make sure the remote branch is deleted.
 
 ```
-$ git checkout develop                               // change to the develop branch  
+$ git checkout develop                               // change to the develop branch
 $ git merge --no-ff feature/GH-id                      // makes sure to create a commit object during merge
 $ git push origin develop                            // push merge changes
 $ git push origin :feature/GH-id                       // deletes the remote branch
@@ -97,7 +97,7 @@ Fix branches differ from feature branches only semantically. Fix branches will b
 
 Although likelihood will be less, during the lifespan of the bug development, the lead should watch the `develop` branch (network tool or branch tool in GitHub) to see if there have been commits since the bug was branched. Any and all changes to `develop` should be merged into the bug before merging back to `develop`; this can be done at various times during the project or at the end, but time to handle merge conflicts should be accounted for.
 
-`<tbd number>` represents the Basecamp project to which Project Management will be tracked. 
+`<tbd number>` represents the Basecamp project to which Project Management will be tracked.
 
 * Must branch from: `develop`
 * Must merge back into: `develop`
@@ -121,7 +121,7 @@ $ git merge develop                                  // merges changes from deve
 When development on the bug is complete, [the Lead] should merge changes into `develop` and then make sure the remote branch is deleted.
 
 ```
-$ git checkout develop                               // change to the develop branch  
+$ git checkout develop                               // change to the develop branch
 $ git merge --no-ff bugfix/GH-id                          // makes sure to create a commit object during merge
 $ git push origin develop                            // push merge changes
 $ git push origin :bugfix/GH-id                           // deletes the remote branch

README.md

@@ -59,6 +59,18 @@ TelegramClient is a **Squeak-Client** for the widely used Telegram-Messenger. It
       <td>🚶</td>
       <td>Logout</td>
     </tr>
+    <tr>
+      <td>😎</td>
+      <td>Display Emojis</td>
+    </tr>
+    <tr>
+      <td>🖼</td>
+      <td>Display Images</td>
+    </tr>
+    <tr>
+      <td>ℹ</td>
+      <td>Show group description and members</td>
+    </tr>
   </tbody>
 </table>
 
@@ -82,6 +94,7 @@ Metacello new
    1. **Last compatible FFI version.** For Squeak version 5.3 use `Metacello new configuration: 'FFI'; load.` to install it.
    2. **JSON** package from [SqueakSource](http://www.squeaksource.com/JSON.html).
    3. **Animations** package [GitHub](https://github.com/hpi-swa/animations/).
+   4. **MTF** package from [GitHub](https://github.com/hpi-swa-teaching/Morphic-Testing-Framework)
 
 2. Check our [release page](https://github.com/hpi-swa-teaching/TelegramClient/releases) for an online installer in the form of a SAR file. Install this SAR file in your Squeak image.
 
@@ -102,4 +115,12 @@ Pre-Releases are created automatically whenever a commit is added to the develop
 
 ## Our Group
 
+Group 2 of the 2021 SWT I module included [Romeo Sommerfeld](https://github.com/rsommerfeld), [Raphael Kunert](https://github.com/Storyxx), [Jannis Berndt](https://github.com/jb3rndt), [Philipp Keese](https://github.com/phkeese), [Tom Richter](https://github.com/tom-richter), and [Paul Ermler](https://github.com/permler).
+
 Group 13 of the 2020 SWT I module included [Rohan Sawahn](https://github.com/rohansaw), [Jonas Schmidt](https://github.com/schmidtjonas), [Frederik Wollny](https://github.com/Freddy200), [Stefan Spangenberg](https://github.com/sspangenberg), [Lukas Laskowski](https://github.com/lasklu), and [Niklas Schilli](https://github.com/Mrnikbobjeff). Feel free to add your names to the list.
+
+## Acknowledgements
+
+This project uses assets from https://openmoji.org/ for Emoji support. These are downloaded when the client starts for the first time and not hosted in this repository.
+Each file is resized before being displayed and filenames are stripped of certain Unicode units after download. The contents of the files is not changed.
+OpenMoji is published under the Creative Commons Share Alike License 4.0 [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/#). Their project is also hosted on [GitHub](https://github.com/hfg-gmuend/openmoji).

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/README.md

@@ -0,0 +1 @@
+defines prequisites

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/baseline..st

@@ -1,7 +1,7 @@
 baseline
 baseline: spec
 	<baseline>
-	
+
 	spec for: #common do: [
 		spec
 			baseline: 'Animations' with: [
@@ -17,17 +17,23 @@ baseline: spec
 			package: 'JSON' with: [
 				spec file: 'JSON-ul.35';
 				repository: 'https://www.squeaksource.com/JSON'];
+			baseline: 'MorphicTestingFramework' with: [
+				spec repository: 'github://hpi-swa-teaching/Morphic-Testing-Framework:master/packages'];
 			baseline: 'SwaLint' with: [
-				spec repository: 'github://hpi-swa-teaching/SwaLint:release/packages'].
-		
+				spec repository: 'github://hpi-swa-teaching/SwaLint:develop/packages'].
+
 		spec
 			package: 'TelegramClient-Core' with: [
 				spec requires: #('libraries')];
 			package: 'TelegramClient-UI' with: [
 				spec requires: #('libraries')];
-			package: 'TelegramClient-Tests' with: [
-				spec requires: #('default' 'SwaLint')].
+			package: 'TelegramClientTests-Misc' with: [
+				spec requires: #('default' 'SwaLint')];
+			package: 'TelegramClientTests-UI' with: [
+				spec requires: #('default' 'MorphicTestingFramework')];
+			package: 'TelegramClientTests-Core' with: [
+				spec requires: #('default')].
 		spec
 			group: 'libraries' with: #('Animations' 'FFI' 'JSON');
 			group: 'default' with: #('TelegramClient-Core' 'TelegramClient-UI');
-			group: 'tests' with: #('TelegramClient-Tests')].
+			group: 'tests' with: #('TelegramClientTests-Misc' 'TelegramClientTests-UI' 'TelegramClientTests-Core')].

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/postLoad.st

@@ -1,6 +1,6 @@
 baseline
 postLoad
-(((Smalltalk respondsTo: #globals) 
+(((Smalltalk respondsTo: #globals)
 		ifTrue: [Smalltalk globals] "Squeak >=4.1"
 		ifFalse: [Smalltalk]) "Pharo and squeak <=4.0"
 		at: #SwaLint) perform: #install.

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/methodProperties.json

@@ -2,5 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "ct 10/8/2020 01:55",
+		"baseline:" : "RS 6/6/2021 15:14",
 		"postLoad" : "N.S. 5/14/2020 17:20" } }

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/properties.json

@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "",
+	"commentStamp" : "per 6/15/2021 09:40",
 	"instvars" : [
 		 ],
 	"name" : "BaselineOfTelegramClient",